June 2012 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH 3/3] ASoC: follow the updated samsung DMA common operations
by Mark Brown 08 Jun '12

08 Jun '12

On Tue, Jun 05, 2012 at 04:20:10PM +0900, Boojin Kim wrote: > This patch uses config() function to configure DMA transmit options. Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> It'd be good if we could get all the older Samsung platforms moved over to dmaengine...

1 0

[alsa-devel] [patch] ASoC: isabelle: using an uninitialized variable
by Dan Carpenter 08 Jun '12

08 Jun '12

We should set "isabelle_regmap" before using it. GCC complains. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index bcc77ef..0d62f3b 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -1126,8 +1126,6 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, struct regmap *isabelle_regmap; int ret = 0; - i2c_set_clientdata(i2c, isabelle_regmap); - isabelle_regmap = devm_regmap_init_i2c(i2c, &isabelle_regmap_config); if (IS_ERR(isabelle_regmap)) { ret = PTR_ERR(isabelle_regmap); @@ -1135,6 +1133,7 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, ret); return ret; } + i2c_set_clientdata(i2c, isabelle_regmap); ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_isabelle, isabelle_dai,

2 1

[alsa-devel] [PATCH] ASoC: dapm: Fix input list to use source widgets.
by Liam Girdwood 08 Jun '12

08 Jun '12

We should only add source widgets to the input list. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9a67a75..20b3402 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -928,7 +928,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, /* do we need to add this widget to the list ? */ if (list) { int err; - err = dapm_list_add_widget(list, path->sink); + err = dapm_list_add_widget(list, path->source); if (err < 0) { dev_err(widget->dapm->dev, "could not add widget %s\n", widget->name); -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: dpcm: Fix dpcm_get_be() to check that DAI is BE.
by Liam Girdwood 08 Jun '12

08 Jun '12

Make sure that the dpcm_get_be() only returns BE DAI links. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index edb0d0c..1b6f6be 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -830,6 +830,9 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, for (i = 0; i < card->num_links; i++) { be = &card->rtd[i]; + if (!be->dai_link->no_pcm) + continue; + if (be->cpu_dai->playback_widget == widget || be->codec_dai->playback_widget == widget) return be; @@ -839,6 +842,9 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, for (i = 0; i < card->num_links; i++) { be = &card->rtd[i]; + if (!be->dai_link->no_pcm) + continue; + if (be->cpu_dai->capture_widget == widget || be->codec_dai->capture_widget == widget) return be; -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: wm2000: Always use a 4s timeout for the firmware
by Mark Brown 08 Jun '12

08 Jun '12

Rather than having varying timeouts depending on the transition always use a 4s timeout. This provides better diagnostics for clocking errors and ensures compatibility with current calibration firmwares. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2000.c | 59 ++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 78a148f..3fd5b29 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -99,8 +99,9 @@ static void wm2000_reset(struct wm2000_priv *wm2000) } static int wm2000_poll_bit(struct i2c_client *i2c, - unsigned int reg, u8 mask, int timeout) + unsigned int reg, u8 mask) { + int timeout = 4000; int val; val = wm2000_read(i2c, reg); @@ -119,7 +120,7 @@ static int wm2000_poll_bit(struct i2c_client *i2c, static int wm2000_power_up(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); - int ret, timeout; + int ret; BUG_ON(wm2000->anc_mode != ANC_OFF); @@ -140,13 +141,13 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) /* Wait for ANC engine to become ready */ if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT, - WM2000_ANC_ENG_IDLE, 1)) { + WM2000_ANC_ENG_IDLE)) { dev_err(&i2c->dev, "ANC engine failed to reset\n"); return -ETIMEDOUT; } if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_BOOT_COMPLETE, 1)) { + WM2000_STATUS_BOOT_COMPLETE)) { dev_err(&i2c->dev, "ANC engine failed to initialise\n"); return -ETIMEDOUT; } @@ -173,16 +174,13 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) dev_dbg(&i2c->dev, "Download complete\n"); if (analogue) { - timeout = 248; - wm2000_write(i2c, WM2000_REG_ANA_VMID_PU_TIME, timeout / 4); + wm2000_write(i2c, WM2000_REG_ANA_VMID_PU_TIME, 248 / 4); wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_ANA_SEQ_INCLUDE | WM2000_MODE_MOUSE_ENABLE | WM2000_MODE_THERMAL_ENABLE); } else { - timeout = 10; - wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_MOUSE_ENABLE | WM2000_MODE_THERMAL_ENABLE); @@ -201,9 +199,8 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) wm2000_write(i2c, WM2000_REG_SYS_CTL2, WM2000_ANC_INT_N_CLR); if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_MOUSE_ACTIVE, timeout)) { - dev_err(&i2c->dev, "Timed out waiting for device after %dms\n", - timeout * 10); + WM2000_STATUS_MOUSE_ACTIVE)) { + dev_err(&i2c->dev, "Timed out waiting for device\n"); return -ETIMEDOUT; } @@ -218,28 +215,25 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) static int wm2000_power_down(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); - int timeout; if (analogue) { - timeout = 248; - wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, timeout / 4); + wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, 248 / 4); wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_ANA_SEQ_INCLUDE | WM2000_MODE_POWER_DOWN); } else { - timeout = 10; wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_POWER_DOWN); } if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_POWER_DOWN_COMPLETE, timeout)) { + WM2000_STATUS_POWER_DOWN_COMPLETE)) { dev_err(&i2c->dev, "Timeout waiting for ANC power down\n"); return -ETIMEDOUT; } if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT, - WM2000_ANC_ENG_IDLE, 1)) { + WM2000_ANC_ENG_IDLE)) { dev_err(&i2c->dev, "Timeout waiting for ANC engine idle\n"); return -ETIMEDOUT; } @@ -268,13 +262,13 @@ static int wm2000_enter_bypass(struct i2c_client *i2c, int analogue) } if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_ANC_DISABLED, 10)) { + WM2000_STATUS_ANC_DISABLED)) { dev_err(&i2c->dev, "Timeout waiting for ANC disable\n"); return -ETIMEDOUT; } if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT, - WM2000_ANC_ENG_IDLE, 1)) { + WM2000_ANC_ENG_IDLE)) { dev_err(&i2c->dev, "Timeout waiting for ANC engine idle\n"); return -ETIMEDOUT; } @@ -311,7 +305,7 @@ static int wm2000_exit_bypass(struct i2c_client *i2c, int analogue) wm2000_write(i2c, WM2000_REG_SYS_CTL2, WM2000_ANC_INT_N_CLR); if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_MOUSE_ACTIVE, 10)) { + WM2000_STATUS_MOUSE_ACTIVE)) { dev_err(&i2c->dev, "Timed out waiting for MOUSE\n"); return -ETIMEDOUT; } @@ -325,38 +319,32 @@ static int wm2000_exit_bypass(struct i2c_client *i2c, int analogue) static int wm2000_enter_standby(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); - int timeout; BUG_ON(wm2000->anc_mode != ANC_ACTIVE); if (analogue) { - timeout = 248; - wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, timeout / 4); + wm2000_write(i2c, WM2000_REG_ANA_VMID_PD_TIME, 248 / 4); wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_ANA_SEQ_INCLUDE | WM2000_MODE_THERMAL_ENABLE | WM2000_MODE_STANDBY_ENTRY); } else { - timeout = 10; - wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_THERMAL_ENABLE | WM2000_MODE_STANDBY_ENTRY); } if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_ANC_DISABLED, timeout)) { + WM2000_STATUS_ANC_DISABLED)) { dev_err(&i2c->dev, "Timed out waiting for ANC disable after 1ms\n"); return -ETIMEDOUT; } - if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT, WM2000_ANC_ENG_IDLE, - 1)) { + if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT, WM2000_ANC_ENG_IDLE)) { dev_err(&i2c->dev, - "Timed out waiting for standby after %dms\n", - timeout * 10); + "Timed out waiting for standby\n"); return -ETIMEDOUT; } @@ -374,23 +362,19 @@ static int wm2000_enter_standby(struct i2c_client *i2c, int analogue) static int wm2000_exit_standby(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); - int timeout; BUG_ON(wm2000->anc_mode != ANC_STANDBY); wm2000_write(i2c, WM2000_REG_SYS_CTL1, 0); if (analogue) { - timeout = 248; - wm2000_write(i2c, WM2000_REG_ANA_VMID_PU_TIME, timeout / 4); + wm2000_write(i2c, WM2000_REG_ANA_VMID_PU_TIME, 248 / 4); wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_ANA_SEQ_INCLUDE | WM2000_MODE_THERMAL_ENABLE | WM2000_MODE_MOUSE_ENABLE); } else { - timeout = 10; - wm2000_write(i2c, WM2000_REG_SYS_MODE_CNTRL, WM2000_MODE_THERMAL_ENABLE | WM2000_MODE_MOUSE_ENABLE); @@ -400,9 +384,8 @@ static int wm2000_exit_standby(struct i2c_client *i2c, int analogue) wm2000_write(i2c, WM2000_REG_SYS_CTL2, WM2000_ANC_INT_N_CLR); if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS, - WM2000_STATUS_MOUSE_ACTIVE, timeout)) { - dev_err(&i2c->dev, "Timed out waiting for MOUSE after %dms\n", - timeout * 10); + WM2000_STATUS_MOUSE_ACTIVE)) { + dev_err(&i2c->dev, "Timed out waiting for MOUSE\n"); return -ETIMEDOUT; } -- 1.7.10

1 0

[alsa-devel] [Q] Writing an alsa module for usb audio & video capture device
by Ezequiel Garcia 07 Jun '12

07 Jun '12

Hi everyone, I'm writing a driver for stk1160 usb bridge (audio & video capture device). The video part is almost done [1] and now I've started the alsa part. As the driver replaces an in-tree staging driver I could just grab the alsa part from the original driver (called easycap), or look into em28xx sources. But as I want to learn a thing or two in this life, I've decided to take a look at sound drivers first. Currently I'm reading through sound/usb/6fire driver (picked randomly). I would like to know: do you have any suggestions and/or hints in order to write a *nice* driver? What driver would you consider as being a *correct* usb sound capture implementation? [1] http://patchwork.linuxtv.org/patch/11577/ Thanks, Ezequiel.

2 4

[alsa-devel] Internal Mics and Speakers not visible in PulseAudio
by David Henningsson 07 Jun '12

07 Jun '12

Posted to both alsa-devel and pulseaudio-discuss lists, as this is a cross issue. PulseAudio tries to figure out what equipment is present on the machine using the mixer. If it finds e g "Headphone Playback Volume", "Headphone Playback Switch", or "Headphone Jack", it assumes that a headphone is present and creates a headphone port. If it finds no ports, it creates a fallback "Analog Output" port. Now assume that we have a laptop with speakers and a headphone jack, but with only a "Master Playback Volume", and a "Headphone Jack" for the jack detection. PulseAudio will take the "Headphone Jack", and create a headphone port. Now, if this port is currently unconnected/unavailable, it will not show up at all [1]. As a result, the internal speakers - for which no port was created - will be essentially unusable. Now, I thought this was a problem with a pair of machines only, that we could easily quirk on the PulseAudio side. But after looking through Ubuntu bugs and posting a blog post [2] about the issue, I have now collected 21 different machines affected, mostly on the input side. Several Realtek chips are affected on the dmic side, and some older STAC92xx chips have problems in both directions. So it becomes evident to me, that this is something that needs to be fixed pretty fast. So, to move forward, we need to expose these speakers and internal mics to userspace. A very simple (untested) patch is attached. This would make "Internal Mic Jack" and "Speaker Jack" show up. Note that the actual status can be overridden/ignored on the PulseAudio side - the importance here is the sign that there are internal mics and speakers, so that the PulseAudio ports get created. I could develop it a little to make sure we don't actually do any jack detection for these pins but always return them as being true/present. That is, if you approve the idea? I admit that the "Internal Mic Jack" is somewhat misleading/hacky as the internal mic is not connected to any physical jack, but it seems like the simplest way of resolving the problem currently. -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic [1] At least in Ubuntu's new Sound Settings UI. [2] http://voices.canonical.com/david.henningsson/2012/05/22/three-audio-bugs-i…

3 8

[alsa-devel] [PATCH V2] ALSA: hda - power setting error check
by Wang Xingchao 07 Jun '12

07 Jun '12

codec may reject power state transition requests(reporting PS-ERROR set), in that case we re-issue a power state setting and check error bit again. Signed-off-by: Wang Xingchao <xingchao.wang(a)intel.com> --- sound/pci/hda/hda_codec.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index d0ca370..a93c7ca 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3526,6 +3526,7 @@ static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, hda_nid_t fg static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, unsigned int power_state) { + int state, count = 0; if (codec->patch_ops.set_power_state) { codec->patch_ops.set_power_state(codec, fg, power_state); return; @@ -3537,9 +3538,19 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, bool epss = snd_hda_codec_get_supported_ps(codec, fg, AC_PWRST_EPSS); msleep(epss? 10:100); } - snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE, - power_state); - snd_hda_codec_set_power_to_all(codec, fg, power_state, true); + + /* repeat power states setting at most 10 times*/ + while (count++ > 10) { + snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE, + power_state); + snd_hda_codec_set_power_to_all(codec, fg, power_state, true); + state = snd_hda_codec_read(codec, fg, 0, + AC_VERB_GET_POWER_STATE, 0); + if (!(state & AC_PWRST_ERROR)) + break; + } + if (count > 10) + snd_printk(KERN_WARNING "Power states transition reject!\n"); } /* modem wake on ring: transition from D2 to D0 in less than 2ms. For modems, -- 1.7.9.5

3 2

Re: [alsa-devel] [PATCH v1 1/5] dmaengine: mmp_tdma: add mmp tdma support
by Vinod Koul 07 Jun '12

07 Jun '12

On Mon, 2012-06-04 at 14:37 +0800, Zhangfei Gao wrote: > Add support for two-channel dma under dmaengine > support: mmp-adma and pxa910-squ > > Signed-off-by: Zhangfei Gao <zhangfei.gao(a)marvell.com> > Signed-off-by: Leo Yan <leoy(a)marvell.com> > Signed-off-by: Qiao Zhou <zhouqiao(a)marvell.com> > + > +static int mmp_tdma_clear_chan_irq(struct mmp_tdma_chan *tdmac) > +{ > + u32 reg = readl(tdmac->reg_base + TDISR); > + > + if (reg & TDISR_COMP) { > + /* clear irq */ > + reg &= ~TDISR_COMP; > + writel(reg, tdmac->reg_base + TDISR); > + > + return 1; hrmm.? > + } > + return 0; > +} > + > +static irqreturn_t mmp_tdma_chan_handler(int irq, void *dev_id) > +{ > + struct mmp_tdma_chan *tdmac = dev_id; > + > + if (mmp_tdma_clear_chan_irq(tdmac)) { > + tdmac->pos = (tdmac->pos + tdmac->period_len) % tdmac->buf_len; > + tasklet_schedule(&tdmac->tasklet); > + return IRQ_HANDLED; > + } else > + return IRQ_NONE; > +} > + > +static irqreturn_t mmp_tdma_int_handler(int irq, void *dev_id) > +{ > + struct mmp_tdma_device *tdev = dev_id; > + int i, ret; > + int irq_num = 0; > + > + for (i = 0; i < TDMA_CHANNEL_NUM; i++) { > + struct mmp_tdma_chan *tdmac = tdev->tdmac[i]; > + > + ret = mmp_tdma_chan_handler(irq, tdmac); > + if (ret == IRQ_HANDLED) > + irq_num++; > + } > + > + if (irq_num) > + return IRQ_HANDLED; > + else > + return IRQ_NONE; > +} > + > +static void dma_do_tasklet(unsigned long data) > +{ > + struct mmp_tdma_chan *tdmac = (struct mmp_tdma_chan *)data; > + > + if (tdmac->desc.callback) > + tdmac->desc.callback(tdmac->desc.callback_param); > + > +} > + > +static void mmp_tdma_free_descriptor(struct mmp_tdma_chan *tdmac) > +{ > + struct gen_pool *gpool; > + int size = tdmac->desc_num * sizeof(struct mmp_tdma_desc); > + > + gpool = sram_get_gpool("asram"); > + if (tdmac->desc_arr) > + gen_pool_free(gpool, (unsigned long)tdmac->desc_arr, > + size); > + tdmac->desc_arr = NULL; > + > + return; > +} > + > +static dma_cookie_t mmp_tdma_tx_submit(struct dma_async_tx_descriptor *tx) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(tx->chan); > + > + mmp_tdma_chan_set_desc(tdmac, tdmac->desc_arr_phys); This seems odd. In submit you are supposed to move this to your pending list. Btw where is the .issue_pending handler? > + > + return 0; > +} > + > +static int mmp_tdma_alloc_chan_resources(struct dma_chan *chan) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + int ret; > + > + dev_dbg(tdmac->dev, "%s: enter\n", __func__); > + > + dma_async_tx_descriptor_init(&tdmac->desc, chan); > + tdmac->desc.tx_submit = mmp_tdma_tx_submit; > + > + if (tdmac->irq) { > + ret = devm_request_irq(tdmac->dev, tdmac->irq, > + mmp_tdma_chan_handler, IRQF_DISABLED, "tdma", tdmac); > + if (ret) > + goto err_request_irq; > + } > + > + return 0; NO. This is supposed to return the number of descriptors allocated. > + > +err_request_irq: > + mmp_tdma_free_descriptor(tdmac); > + return ret; > +} > + > +static void mmp_tdma_free_chan_resources(struct dma_chan *chan) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + > + dev_dbg(tdmac->dev, "%s: enter\n", __func__); > + > + if (tdmac->irq) > + devm_free_irq(tdmac->dev, tdmac->irq, tdmac); > + mmp_tdma_disable_chan(tdmac); channel should be already disabled, why do you need this here? > + mmp_tdma_free_descriptor(tdmac); > + return; > +} > + > + > +static struct dma_async_tx_descriptor *mmp_tdma_prep_slave_sg( > + struct dma_chan *chan, struct scatterlist *sgl, > + unsigned int sg_len, enum dma_transfer_direction direction, > + unsigned long flags, void *context) > +{ > + /* > + * This operation is not supported on the TDMA controller > + * > + * However, we need to provide the function pointer to allow the > + * device_control() method to work. > + */ > + return NULL; > +} Pls remove if not supported > + > +static int mmp_tdma_alloc_descriptor(struct mmp_tdma_chan *tdmac) > +{ > + struct gen_pool *gpool; > + int size = tdmac->desc_num * sizeof(struct mmp_tdma_desc); > + > + dev_dbg(tdmac->dev, "%s: enter\n", __func__); > + > + gpool = sram_get_gpool("asram"); > + if (!gpool) > + return -ENOMEM; > + > + tdmac->desc_arr = (void *)gen_pool_alloc(gpool, size); > + if (!tdmac->desc_arr) > + return -ENOMEM; > + > + tdmac->desc_arr_phys = gen_pool_virt_to_phys(gpool, > + (unsigned long)tdmac->desc_arr); > + > + return 0; this needs fix > +} > + > +static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic( > + struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len, > + size_t period_len, enum dma_transfer_direction direction, > + void *context) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + int num_periods = buf_len / period_len; > + int i = 0, buf = 0; > + int ret; > + > + if (tdmac->status != DMA_SUCCESS) > + return NULL; > + > + if (period_len > TDMA_MAX_XFER_BYTES) { > + dev_err(tdmac->dev, > + "maximum period size exceeded: %d > %d\n", > + period_len, TDMA_MAX_XFER_BYTES); > + goto err_out; > + } > + > + tdmac->status = DMA_IN_PROGRESS; ??? > + tdmac->desc_num = num_periods; > + ret = mmp_tdma_alloc_descriptor(tdmac); > + if (ret < 0) > + goto err_out; > + > + while (buf < buf_len) { > + struct mmp_tdma_desc *desc = &tdmac->desc_arr[i]; what if i call prepare twice on the same channel? Better way would to manage a descriptor list, see other drivers for examples. > + > + if (i + 1 == num_periods) > + desc->nxt_desc = tdmac->desc_arr_phys; > + else > + desc->nxt_desc = tdmac->desc_arr_phys + > + sizeof(*desc) * (i + 1); pls use kernel link list, it is provided to you so that you dont have to do above. > + > + if (direction == DMA_MEM_TO_DEV) { > + desc->src_addr = dma_addr; > + desc->dst_addr = tdmac->dev_addr; > + } else { > + desc->src_addr = tdmac->dev_addr; > + desc->dst_addr = dma_addr; > + } > + desc->byte_cnt = period_len; > + dma_addr += period_len; > + buf += period_len; > + i++; > + } > + > + tdmac->buf_len = buf_len; > + tdmac->period_len = period_len; > + tdmac->pos = 0; > + > + return &tdmac->desc; > + > +err_out: > + tdmac->status = DMA_ERROR; > + return NULL; > +} > + > +static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, > + unsigned long arg) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + struct dma_slave_config *dmaengine_cfg = (void *)arg; > + int ret = 0; > + > + switch (cmd) { > + case DMA_TERMINATE_ALL: > + mmp_tdma_disable_chan(tdmac); > + break; > + case DMA_PAUSE: > + mmp_tdma_pause_chan(tdmac); > + break; > + case DMA_RESUME: > + mmp_tdma_resume_chan(tdmac); > + break; > + case DMA_SLAVE_CONFIG: > + if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) { > + tdmac->dev_addr = dmaengine_cfg->src_addr; > + tdmac->burst_sz = dmaengine_cfg->src_maxburst; > + } else { > + tdmac->dev_addr = dmaengine_cfg->dst_addr; > + tdmac->burst_sz = dmaengine_cfg->dst_maxburst; > + } > + tdmac->dir = dmaengine_cfg->direction; > + return mmp_tdma_config_chan(tdmac); > + default: > + ret = -ENOSYS; > + } > + > + return ret; > +} > + > +static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan, > + dma_cookie_t cookie, struct dma_tx_state *txstate) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + > + dma_set_residue(txstate, tdmac->buf_len - tdmac->pos); > + > + return tdmac->status; > +} > + > +static void mmp_tdma_issue_pending(struct dma_chan *chan) > +{ > + struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); > + > + mmp_tdma_enable_chan(tdmac); can you queue the descriptors here? That was purpose to have separate issue pending and submit. > +} > + > +static int __devexit mmp_tdma_remove(struct platform_device *pdev) > +{ > + struct mmp_tdma_device *tdev = platform_get_drvdata(pdev); > + > + dma_async_device_unregister(&tdev->device); > + return 0; > +} > + > +static int __devinit mmp_tdma_chan_init(struct mmp_tdma_device *tdev, > + int idx, int irq, int type) > +{ > + struct mmp_tdma_chan *tdmac; > + > + if (idx >= TDMA_CHANNEL_NUM) { > + dev_err(tdev->dev, "too many channels for device!\n"); > + return -EINVAL; > + } > + > + /* alloc channel */ > + tdmac = devm_kzalloc(tdev->dev, sizeof(*tdmac), GFP_KERNEL); > + if (!tdmac) { > + dev_err(tdev->dev, "no free memory for DMA channels!\n"); > + return -ENOMEM; > + } > + if (irq) > + tdmac->irq = irq + idx; > + tdmac->dev = tdev->dev; > + tdmac->chan.device = &tdev->device; > + tdmac->idx = idx; > + tdmac->type = type; > + tdmac->reg_base = (unsigned long)tdev->base + idx * 4; > + tdmac->status = DMA_SUCCESS; > + tdev->tdmac[tdmac->idx] = tdmac; > + tasklet_init(&tdmac->tasklet, dma_do_tasklet, (unsigned long)tdmac); > + > + /* add the channel to tdma_chan list */ > + list_add_tail(&tdmac->chan.device_node, > + &tdev->device.channels); > + > + return 0; > +} > + > +static int __devinit mmp_tdma_probe(struct platform_device *pdev) > +{ > + const struct platform_device_id *id = platform_get_device_id(pdev); > + enum mmp_tdma_type type = id->driver_data; > + struct mmp_tdma_device *tdev; > + struct resource *iores; > + int i, ret; > + int irq = 0; > + int chan_num = TDMA_CHANNEL_NUM; > + > + /* always have couple channels */ > + tdev = devm_kzalloc(&pdev->dev, sizeof(*tdev), GFP_KERNEL); > + if (!tdev) > + return -ENOMEM; > + > + tdev->dev = &pdev->dev; > + iores = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > + if (!iores) > + return -EINVAL; > + > + if (resource_size(iores) != chan_num) > + tdev->irq = iores->start; > + else > + irq = iores->start; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!iores) > + return -EINVAL; > + > + tdev->base = devm_request_and_ioremap(&pdev->dev, iores); > + if (!tdev->base) > + return -EADDRNOTAVAIL; > + > + if (tdev->irq) { > + ret = devm_request_irq(&pdev->dev, tdev->irq, > + mmp_tdma_int_handler, IRQF_DISABLED, "tdma", tdev); > + if (ret) > + return ret; > + } > + > + dma_cap_set(DMA_SLAVE, tdev->device.cap_mask); > + dma_cap_set(DMA_CYCLIC, tdev->device.cap_mask); > + > + INIT_LIST_HEAD(&tdev->device.channels); > + > + /* initialize channel parameters */ > + for (i = 0; i < chan_num; i++) { > + ret = mmp_tdma_chan_init(tdev, i, irq, type); > + if (ret) > + return ret; > + } > + > + tdev->device.dev = &pdev->dev; > + tdev->device.device_alloc_chan_resources = > + mmp_tdma_alloc_chan_resources; > + tdev->device.device_free_chan_resources = > + mmp_tdma_free_chan_resources; > + tdev->device.device_prep_slave_sg = mmp_tdma_prep_slave_sg; > + tdev->device.device_prep_dma_cyclic = mmp_tdma_prep_dma_cyclic; > + tdev->device.device_tx_status = mmp_tdma_tx_status; > + tdev->device.device_issue_pending = mmp_tdma_issue_pending; > + tdev->device.device_control = mmp_tdma_control; > + tdev->device.copy_align = TDMA_ALIGNMENT; > + > + dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); > + platform_set_drvdata(pdev, tdev); > + > + ret = dma_async_device_register(&tdev->device); > + if (ret) { > + dev_err(tdev->device.dev, "unable to register\n"); > + return ret; > + } > + > + dev_info(tdev->device.dev, "initialized\n"); > + return 0; > +} > + > +static const struct platform_device_id mmp_tdma_id_table[] = { > + { "mmp-adma", MMP_AUD_TDMA }, > + { "pxa910-squ", PXA910_SQU }, > + { }, > +}; > + > +static struct platform_driver mmp_tdma_driver = { > + .driver = { > + .name = "mmp-tdma", > + .owner = THIS_MODULE, > + }, > + .id_table = mmp_tdma_id_table, > + .probe = mmp_tdma_probe, > + .remove = __devexit_p(mmp_tdma_remove), > +}; > + > +module_platform_driver(mmp_tdma_driver); > + > +MODULE_DESCRIPTION("MMP Two-Channel DMA Driver"); > +MODULE_LICENSE("GPL"); AUTHOR, ALIAS too pls > diff --git a/include/linux/platform_data/mmp_dma.h b/include/linux/platform_data/mmp_dma.h > new file mode 100644 > index 0000000..4e21cf9 > --- /dev/null > +++ b/include/linux/platform_data/mmp_dma.h > @@ -0,0 +1,20 @@ > +/* > + * MMP Platform DMA Management > + * > + * Copyright (c) 2011 Marvell Semiconductors Inc. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + */ > + > +#ifndef MMP_DMA_H > +#define MMP_DMA_H > + > +struct mmp_tdma_data { > + u32 bus_size; > + u32 pack_mod; > +}; > + > +#endif /* MMP_DMA_H */ why do you need separate header for this? -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 3

Re: [alsa-devel] [PATCH v1 2/5] ASoC: mmp: add audio dma support
by Vinod Koul 07 Jun '12

07 Jun '12

On Mon, 2012-06-04 at 14:37 +0800, Zhangfei Gao wrote: > mmp-pcm handle audio dma based on soc-dmaengine > Support mmp and pxa910 See soc-dmaengine.c. You sneed to use the library to use dmaengine. > > Signed-off-by: Zhangfei Gao <zhangfei.gao(a)marvell.com> > Signed-off-by: Leo Yan <leoy(a)marvell.com> > Signed-off-by: Qiao Zhou <zhouqiao(a)marvell.com> > --- > include/linux/platform_data/mmp_audio.h | 22 ++ > sound/soc/pxa/Kconfig | 9 + > sound/soc/pxa/Makefile | 2 + > sound/soc/pxa/mmp-pcm.c | 317 +++++++++++++++++++++++++++++++ > 4 files changed, 350 insertions(+), 0 deletions(-) > create mode 100644 include/linux/platform_data/mmp_audio.h > create mode 100644 sound/soc/pxa/mmp-pcm.c > > diff --git a/include/linux/platform_data/mmp_audio.h b/include/linux/platform_data/mmp_audio.h > new file mode 100644 > index 0000000..0f25d16 > --- /dev/null > +++ b/include/linux/platform_data/mmp_audio.h > @@ -0,0 +1,22 @@ > +/* > + * MMP Platform AUDIO Management > + * > + * Copyright (c) 2011 Marvell Semiconductors Inc. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + */ > + > +#ifndef MMP_AUDIO_H > +#define MMP_AUDIO_H > + > +struct mmp_audio_platdata { > + u32 period_max_capture; > + u32 buffer_max_capture; > + u32 period_max_playback; > + u32 buffer_max_playback; > +}; > + > +#endif /* MMP_AUDIO_H */ > diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig > index a0f7d3c..5d76e29 100644 > --- a/sound/soc/pxa/Kconfig > +++ b/sound/soc/pxa/Kconfig > @@ -8,6 +8,15 @@ config SND_PXA2XX_SOC > the PXA2xx AC97, I2S or SSP interface. You will also need > to select the audio interfaces to support below. > > +config SND_MMP_SOC > + bool "Soc Audio for Marvell MMP chips" > + depends on ARCH_MMP > + select SND_SOC_DMAENGINE_PCM > + select SND_ARM > + help > + Say Y if you want to add support for codecs attached to > + the MMP SSPA interface. > + > config SND_PXA2XX_AC97 > tristate > select SND_AC97_CODEC > diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile > index af35762..f913e9b 100644 > --- a/sound/soc/pxa/Makefile > +++ b/sound/soc/pxa/Makefile > @@ -3,11 +3,13 @@ snd-soc-pxa2xx-objs := pxa2xx-pcm.o > snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o > snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o > snd-soc-pxa-ssp-objs := pxa-ssp.o > +snd-soc-mmp-objs := mmp-pcm.o > > obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o > obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o > obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o > obj-$(CONFIG_SND_PXA_SOC_SSP) += snd-soc-pxa-ssp.o > +obj-$(CONFIG_SND_MMP_SOC) += snd-soc-mmp.o > > # PXA Machine Support > snd-soc-corgi-objs := corgi.o > diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c > new file mode 100644 > index 0000000..b7b09f9 > --- /dev/null > +++ b/sound/soc/pxa/mmp-pcm.c > @@ -0,0 +1,317 @@ > +/* > + * linux/sound/soc/pxa/mmp-pcm.c > + * > + * Copyright (C) 2011 Marvell International Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + */ > +#include <linux/module.h> > +#include <linux/init.h> > +#include <linux/platform_device.h> > +#include <linux/slab.h> > +#include <linux/dma-mapping.h> > +#include <linux/dmaengine.h> > +#include <linux/platform_data/mmp_dma.h> > +#include <linux/platform_data/mmp_audio.h> > +#include <sound/pxa2xx-lib.h> > +#include <sound/core.h> > +#include <sound/pcm.h> > +#include <sound/pcm_params.h> > +#include <sound/soc.h> > +#include <mach/sram.h> > +#include <sound/dmaengine_pcm.h> > + > +struct mmp_dma_data { > + int ssp_id; > + struct resource *dma_res; > + struct mmp_tdma_data tdma_data; > +}; > + > +#define MMP_PCM_INFO (SNDRV_PCM_INFO_MMAP | \ > + SNDRV_PCM_INFO_MMAP_VALID | \ > + SNDRV_PCM_INFO_INTERLEAVED | \ > + SNDRV_PCM_INFO_PAUSE | \ > + SNDRV_PCM_INFO_RESUME) > + > +#define MMP_PCM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ > + SNDRV_PCM_FMTBIT_S24_LE | \ > + SNDRV_PCM_FMTBIT_S32_LE) > + > +static struct snd_pcm_hardware mmp_pcm_hardware[] = { > + { > + .info = MMP_PCM_INFO, > + .formats = MMP_PCM_FORMATS, > + .period_bytes_min = 1024, > + .period_bytes_max = 2048, > + .periods_min = 2, > + .periods_max = 32, > + .buffer_bytes_max = 4096, > + .fifo_size = 32, > + }, > + { > + .info = MMP_PCM_INFO, > + .formats = MMP_PCM_FORMATS, > + .period_bytes_min = 1024, > + .period_bytes_max = 2048, > + .periods_min = 2, > + .periods_max = 32, > + .buffer_bytes_max = 4096, > + .fifo_size = 32, > + }, > +}; > + > +static int mmp_pcm_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params) > +{ > + struct mmp_dma_data *dma_data = snd_dmaengine_pcm_get_data(substream); > + struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream); > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > + struct pxa2xx_pcm_dma_params *dma_params; > + int ret; > + struct dma_slave_config slave_config; > + > + dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); > + if (!dma_params) > + return 0; > + > + switch (params_format(params)) { > + case SNDRV_PCM_FORMAT_S8: > + dma_data->tdma_data.bus_size = 8; > + break; > + case SNDRV_PCM_FORMAT_S16_LE: > + dma_data->tdma_data.bus_size = 16; > + break; > + case SNDRV_PCM_FORMAT_S24_LE: > + dma_data->tdma_data.bus_size = 24; > + break; > + case SNDRV_PCM_FORMAT_S32_LE: > + dma_data->tdma_data.bus_size = 32; > + break; > + default: > + return -EINVAL; > + } > + dma_data->tdma_data.pack_mod = true; > + > + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { > + slave_config.direction = DMA_TO_DEVICE; > + slave_config.dst_addr = dma_params->dev_addr; > + slave_config.dst_maxburst = 4; > + } else { > + slave_config.direction = DMA_FROM_DEVICE; > + slave_config.src_addr = dma_params->dev_addr; > + slave_config.src_maxburst = 4; > + } > + > + ret = dmaengine_slave_config(chan, &slave_config); > + if (ret) > + return ret; > + > + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); > + > + return 0; > +} > + > +static bool filter(struct dma_chan *chan, void *param) > +{ > + struct mmp_dma_data *dma_data = param; > + bool found = false; > + char *devname; > + > + devname = kasprintf(GFP_KERNEL, "%s.%d", dma_data->dma_res->name, > + dma_data->ssp_id); > + if ((strcmp(dev_name(chan->device->dev), devname) == 0) && > + (chan->chan_id == dma_data->dma_res->start)) { > + chan->private = &dma_data->tdma_data; > + found = true; > + } > + > + kfree(devname); > + return found; > +} > + > +static int mmp_pcm_open(struct snd_pcm_substream *substream) > +{ > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > + struct platform_device *pdev = to_platform_device(rtd->platform->dev); > + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; > + struct mmp_dma_data *dma_data; > + struct resource *r; > + int ret; > + > + r = platform_get_resource(pdev, IORESOURCE_DMA, substream->stream); > + if (!r) > + return -EBUSY; > + > + snd_soc_set_runtime_hwparams(substream, > + &mmp_pcm_hardware[substream->stream]); > + dma_data = devm_kzalloc(&pdev->dev, > + sizeof(struct mmp_dma_data), GFP_KERNEL); > + if (dma_data == NULL) > + return -ENOMEM; > + > + dma_data->dma_res = r; > + dma_data->ssp_id = cpu_dai->id; > + > + ret = snd_dmaengine_pcm_open(substream, filter, dma_data); > + if (ret) { > + devm_kfree(&pdev->dev, dma_data); > + return ret; > + } > + > + snd_dmaengine_pcm_set_data(substream, dma_data); > + return 0; > +} > + > +static int mmp_pcm_close(struct snd_pcm_substream *substream) > +{ > + struct mmp_dma_data *dma_data = snd_dmaengine_pcm_get_data(substream); > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > + struct platform_device *pdev = to_platform_device(rtd->platform->dev); > + > + snd_dmaengine_pcm_close(substream); > + devm_kfree(&pdev->dev, dma_data); > + return 0; > +} > + > +static int mmp_pcm_mmap(struct snd_pcm_substream *substream, > + struct vm_area_struct *vma) > +{ > + struct snd_pcm_runtime *runtime = substream->runtime; > + unsigned long off = vma->vm_pgoff; > + > + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > + return remap_pfn_range(vma, vma->vm_start, > + __phys_to_pfn(runtime->dma_addr) + off, > + vma->vm_end - vma->vm_start, vma->vm_page_prot); > +} > + > +struct snd_pcm_ops mmp_pcm_ops = { > + .open = mmp_pcm_open, > + .close = mmp_pcm_close, > + .ioctl = snd_pcm_lib_ioctl, > + .hw_params = mmp_pcm_hw_params, > + .trigger = snd_dmaengine_pcm_trigger, > + .pointer = snd_dmaengine_pcm_pointer, > + .mmap = mmp_pcm_mmap, > +}; > + > +static void mmp_pcm_free_dma_buffers(struct snd_pcm *pcm) > +{ > + struct snd_pcm_substream *substream; > + struct snd_dma_buffer *buf; > + int stream; > + struct gen_pool *gpool; > + > + gpool = sram_get_gpool("asram"); > + if (!gpool) > + return; > + > + for (stream = 0; stream < 2; stream++) { > + size_t size = mmp_pcm_hardware[stream].buffer_bytes_max; > + > + substream = pcm->streams[stream].substream; > + if (!substream) > + continue; > + > + buf = &substream->dma_buffer; > + if (!buf->area) > + continue; > + gen_pool_free(gpool, (unsigned long)buf->area, size); > + buf->area = NULL; > + } > + > + return; > +} > + > +static int mmp_pcm_preallocate_dma_buffer(struct snd_pcm_substream *substream, > + int stream) > +{ > + struct snd_dma_buffer *buf = &substream->dma_buffer; > + size_t size = mmp_pcm_hardware[stream].buffer_bytes_max; > + struct gen_pool *gpool; > + > + buf->dev.type = SNDRV_DMA_TYPE_DEV; > + buf->dev.dev = substream->pcm->card->dev; > + buf->private_data = NULL; > + > + gpool = sram_get_gpool("asram"); > + if (!gpool) > + return -ENOMEM; > + > + buf->area = (unsigned char *)gen_pool_alloc(gpool, size); > + if (!buf->area) > + return -ENOMEM; > + buf->addr = gen_pool_virt_to_phys(gpool, (unsigned long)buf->area); > + buf->bytes = size; > + return 0; > +} > + > +int mmp_pcm_new(struct snd_soc_pcm_runtime *rtd) > +{ > + struct snd_pcm_substream *substream; > + struct snd_pcm *pcm = rtd->pcm; > + int ret = 0, stream; > + > + for (stream = 0; stream < 2; stream++) { > + substream = pcm->streams[stream].substream; > + > + ret = mmp_pcm_preallocate_dma_buffer(substream, stream); > + if (ret) > + goto err; > + } > + > + return 0; > + > +err: > + mmp_pcm_free_dma_buffers(pcm); > + return ret; > +} > + > +struct snd_soc_platform_driver mmp_soc_platform = { > + .ops = &mmp_pcm_ops, > + .pcm_new = mmp_pcm_new, > + .pcm_free = mmp_pcm_free_dma_buffers, > +}; > + > +static __devinit int mmp_pcm_probe(struct platform_device *pdev) > +{ > + struct mmp_audio_platdata *pdata = pdev->dev.platform_data; > + > + if (pdata) { > + mmp_pcm_hardware[SNDRV_PCM_STREAM_PLAYBACK].buffer_bytes_max = > + pdata->buffer_max_playback; > + mmp_pcm_hardware[SNDRV_PCM_STREAM_PLAYBACK].period_bytes_max = > + pdata->period_max_playback; > + mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].buffer_bytes_max = > + pdata->buffer_max_capture; > + mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max = > + pdata->period_max_capture; > + } > + return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform); > +} > + > +static int __devexit mmp_pcm_remove(struct platform_device *pdev) > +{ > + snd_soc_unregister_platform(&pdev->dev); > + return 0; > +} > + > +static struct platform_driver mmp_pcm_driver = { > + .driver = { > + .name = "mmp-pcm-audio", > + .owner = THIS_MODULE, > + }, > + > + .probe = mmp_pcm_probe, > + .remove = __devexit_p(mmp_pcm_remove), > +}; > + > +module_platform_driver(mmp_pcm_driver); > + > +MODULE_AUTHOR("Leo Yan <leoy(a)marvell.com>"); > +MODULE_DESCRIPTION("MMP Soc Audio DMA module"); > +MODULE_LICENSE("GPL"); -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 5