diff options
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 783 |
1 files changed, 690 insertions, 93 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index bed09c2..3992868 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -25,41 +25,65 @@ #include <linux/init.h> #include <linux/module.h> -#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/wait.h> +#include <linux/interrupt.h> +#include <linux/err.h> +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/slab.h> +#include <linux/pm_runtime.h> + #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/initval.h> #include <sound/soc.h> +#include <plat/control.h> #include <plat/dma.h> -#include <plat/mcbsp.h> -#include "mcpdm.h" +#include <plat/omap_hwmod.h> +#include "omap-mcpdm.h" #include "omap-pcm.h" - -struct omap_mcpdm_data { - struct omap_mcpdm_link *links; - int active; -}; - -static struct omap_mcpdm_link omap_mcpdm_links[] = { - /* downlink */ - { - .irq_mask = MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL, - .threshold = 1, - .format = PDMOUTFORMAT_LJUST, - }, - /* uplink */ - { - .irq_mask = MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL, - .threshold = 1, - .format = PDMOUTFORMAT_LJUST, - }, -}; - -static struct omap_mcpdm_data mcpdm_data = { - .links = omap_mcpdm_links, - .active = 0, +#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) ||\ + defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) +#include "omap-abe-dsp.h" +#include "abe/abe_main.h" +#include "abe/port_mgr.h" +#endif + +#define MCPDM_LEGACY_DAI_DL1 0 +#define MCPDM_LEGACY_DAI_UL1 1 +#define MCPDM_ABE_DAI_DL1 2 +#define MCPDM_ABE_DAI_DL2 3 +#define MCPDM_ABE_DAI_VIB 4 +#define MCPDM_ABE_DAI_UL1 5 + +struct omap_mcpdm { + struct device *dev; + unsigned long phys_base; + void __iomem *io_base; + int irq; + struct delayed_work delayed_work; + + struct mutex mutex; + struct omap_mcpdm_platform_data *pdata; + struct completion irq_completion; + struct abe *abe; + struct omap_abe_port *dl_port; + struct omap_abe_port *ul_port; + + /* channel data */ + u32 dn_channels; + u32 up_channels; + int dl_active; + int ul_active; + int abe_mode[2]; + + /* DC offset */ + unsigned long dl1_offset; + unsigned long dl2_offset; }; /* @@ -84,64 +108,417 @@ static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = { }, }; +static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, + u16 reg, u32 val) +{ + __raw_writel(val, mcpdm->io_base + reg); +} + +static inline int omap_mcpdm_read(struct omap_mcpdm *mcpdm, u16 reg) +{ + return __raw_readl(mcpdm->io_base + reg); +} + +#ifdef DEBUG +static void omap_mcpdm_reg_dump(struct omap_mcpdm *mcpdm) +{ + dev_dbg(mcpdm->dev, "***********************\n"); + dev_dbg(mcpdm->dev, "IRQSTATUS_RAW: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_IRQSTATUS_RAW)); + dev_dbg(mcpdm->dev, "IRQSTATUS: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_IRQSTATUS)); + dev_dbg(mcpdm->dev, "IRQENABLE_SET: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_IRQENABLE_SET)); + dev_dbg(mcpdm->dev, "IRQENABLE_CLR: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_IRQENABLE_CLR)); + dev_dbg(mcpdm->dev, "IRQWAKE_EN: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_IRQWAKE_EN)); + dev_dbg(mcpdm->dev, "DMAENABLE_SET: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_DMAENABLE_SET)); + dev_dbg(mcpdm->dev, "DMAENABLE_CLR: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_DMAENABLE_CLR)); + dev_dbg(mcpdm->dev, "DMAWAKEEN: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_DMAWAKEEN)); + dev_dbg(mcpdm->dev, "CTRL: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_CTRL)); + dev_dbg(mcpdm->dev, "DN_DATA: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_DN_DATA)); + dev_dbg(mcpdm->dev, "UP_DATA: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_UP_DATA)); + dev_dbg(mcpdm->dev, "FIFO_CTRL_DN: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_FIFO_CTRL_DN)); + dev_dbg(mcpdm->dev, "FIFO_CTRL_UP: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_FIFO_CTRL_UP)); + dev_dbg(mcpdm->dev, "DN_OFFSET: 0x%04x\n", + omap_mcpdm_read(mcpdm, MCPDM_DN_OFFSET)); + dev_dbg(mcpdm->dev, "***********************\n"); +} +#else +static void omap_mcpdm_reg_dump(struct omap_mcpdm *mcpdm) {} +#endif + +/* + * Enables the transfer through the PDM interface to/from the Phoenix + * codec by enabling the corresponding UP or DN channels. + */ +static void omap_mcpdm_start(struct omap_mcpdm *mcpdm, int stream) +{ + u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_CTRL); + + if (stream) { + ctrl |= SW_UP_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl |= mcpdm->up_channels; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~SW_UP_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + } else { + ctrl |= SW_DN_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl |= mcpdm->dn_channels; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~SW_DN_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + } +} + +/* + * Disables the transfer through the PDM interface to/from the Phoenix + * codec by disabling the corresponding UP or DN channels. + */ +static void omap_mcpdm_stop(struct omap_mcpdm *mcpdm, int stream) +{ + u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_CTRL); + + if (stream) { + ctrl |= SW_UP_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~mcpdm->up_channels; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~SW_UP_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + } else { + ctrl |= SW_DN_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~mcpdm->dn_channels; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + ctrl &= ~SW_DN_RST; + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl); + } + +} + +/* + * Is the physical McPDM interface active. + */ +static inline int omap_mcpdm_active(struct omap_mcpdm *mcpdm) +{ + return omap_mcpdm_read(mcpdm, MCPDM_CTRL) & (PDM_DN_MASK | PDM_UP_MASK); +} + +/* + * Configures McPDM uplink for audio recording. + * This function should be called before omap_mcpdm_start. + */ +static void omap_mcpdm_capture_open(struct omap_mcpdm *mcpdm) +{ + /* Enable irq request generation */ + omap_mcpdm_write(mcpdm, MCPDM_IRQENABLE_SET, + MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL); + + /* Configure uplink threshold */ + omap_mcpdm_write(mcpdm, MCPDM_FIFO_CTRL_UP, 2); + + /* Configure DMA controller */ + omap_mcpdm_write(mcpdm, MCPDM_DMAENABLE_SET, DMA_UP_ENABLE); +} + +/* + * Configures McPDM downlink for audio playback. + * This function should be called before omap_mcpdm_start. + */ +static void omap_mcpdm_playback_open(struct omap_mcpdm *mcpdm) +{ + /* Enable irq request generation */ + omap_mcpdm_write(mcpdm, MCPDM_IRQENABLE_SET, + MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL); + + /* Configure uplink threshold */ + omap_mcpdm_write(mcpdm, MCPDM_FIFO_CTRL_DN, 2); + + /* Enable DMA request generation */ + omap_mcpdm_write(mcpdm, MCPDM_DMAENABLE_SET, DMA_DN_ENABLE); +} + +/* + * Cleans McPDM uplink configuration. + * This function should be called when the stream is closed. + */ +static void omap_mcpdm_capture_close(struct omap_mcpdm *mcpdm) +{ + /* Disable irq request generation */ + omap_mcpdm_write(mcpdm, MCPDM_IRQENABLE_CLR, + MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL); + + /* Disable DMA request generation */ + omap_mcpdm_write(mcpdm, MCPDM_DMAENABLE_CLR, DMA_UP_ENABLE); +} + +/* + * Cleans McPDM downlink configuration. + * This function should be called when the stream is closed. + */ +static void omap_mcpdm_playback_close(struct omap_mcpdm *mcpdm) +{ + /* Disable irq request generation */ + omap_mcpdm_write(mcpdm, MCPDM_IRQENABLE_CLR, + MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL); + + /* Disable DMA request generation */ + omap_mcpdm_write(mcpdm, MCPDM_DMAENABLE_CLR, DMA_DN_ENABLE); +} + +static irqreturn_t omap_mcpdm_irq_handler(int irq, void *dev_id) +{ + struct omap_mcpdm *mcpdm = dev_id; + int irq_status; + + irq_status = omap_mcpdm_read(mcpdm, MCPDM_IRQSTATUS); + + /* Acknowledge irq event */ + omap_mcpdm_write(mcpdm, MCPDM_IRQSTATUS, irq_status); + + if (irq & MCPDM_DN_IRQ_FULL) + dev_err(mcpdm->dev, "DN FIFO error %x\n", irq_status); + + if (irq & MCPDM_DN_IRQ_EMPTY) + dev_err(mcpdm->dev, "DN FIFO error %x\n", irq_status); + + if (irq & MCPDM_DN_IRQ) + dev_dbg(mcpdm->dev, "DN write request\n"); + + if (irq & MCPDM_UP_IRQ_FULL) + dev_err(mcpdm->dev, "UP FIFO error %x\n", irq_status); + + if (irq & MCPDM_UP_IRQ_EMPTY) + dev_err(mcpdm->dev, "UP FIFO error %x\n", irq_status); + + if (irq & MCPDM_UP_IRQ) + dev_dbg(mcpdm->dev, "UP write request\n"); + + return IRQ_HANDLED; +} + +/* Enable/disable DC offset cancelation for the analog + * headset path (PDM channels 1 and 2). + */ +static void omap_mcpdm_set_offset(struct omap_mcpdm *mcpdm) +{ + int offset; + + if (mcpdm->dl1_offset > DN_OFST_MAX) { + dev_err(mcpdm->dev, "DC DL1 offset out of range\n"); + return; + } + + if (mcpdm->dl2_offset > DN_OFST_MAX) { + dev_err(mcpdm->dev, "DC DL2 offset out of range\n"); + return; + } + + offset = (mcpdm->dl1_offset << DN_OFST_RX1) | + (mcpdm->dl2_offset << DN_OFST_RX2); + + /* offset cancellation for channel 1 */ + if (mcpdm->dl1_offset) + offset |= DN_OFST_RX1_EN; + else + offset &= ~DN_OFST_RX1_EN; + + /* offset cancellation for channel 2 */ + if (mcpdm->dl2_offset) + offset |= DN_OFST_RX2_EN; + else + offset &= ~DN_OFST_RX2_EN; + + omap_mcpdm_write(mcpdm, MCPDM_DN_OFFSET, offset); +} + +static ssize_t mcpdm_dl1_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct omap_mcpdm *mcpdm = dev_get_drvdata(dev); + + return sprintf(buf, "%ld\n", mcpdm->dl1_offset); +} + +static ssize_t mcpdm_dl1_set(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct omap_mcpdm *mcpdm = dev_get_drvdata(dev); + int ret; + unsigned long value; + + ret = strict_strtol(buf, 10, &value); + if (ret) + return ret; + + if (value > DN_OFST_MAX) + return -EINVAL; + + mcpdm->dl1_offset = value; + return count; +} + +static ssize_t mcpdm_dl2_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct omap_mcpdm *mcpdm = dev_get_drvdata(dev); + + return sprintf(buf, "%ld\n", mcpdm->dl2_offset); +} + +static ssize_t mcpdm_dl2_set(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct omap_mcpdm *mcpdm = dev_get_drvdata(dev); + int ret; + unsigned long value; + + ret = strict_strtol(buf, 10, &value); + if (ret) + return ret; + + if (value > DN_OFST_MAX) + return -EINVAL; + + mcpdm->dl2_offset = value; + return count; +} + +static DEVICE_ATTR(dl1, 0644, mcpdm_dl1_show, mcpdm_dl1_set); +static DEVICE_ATTR(dl2, 0644, mcpdm_dl2_show, mcpdm_dl2_set); + static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); + u32 ctrl; int err = 0; - if (!dai->active) - err = omap_mcpdm_request(); + dev_dbg(dai->dev, "%s: active %d\n", __func__, dai->active); + + /* make sure we stop any pre-existing shutdown */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + cancel_delayed_work(&mcpdm->delayed_work); + + mutex_lock(&mcpdm->mutex); + + if (!dai->active) { + pm_runtime_get_sync(mcpdm->dev); + omap_mcpdm_set_offset(mcpdm); + + /* Enable McPDM watch dog for ES above ES 1.0 to avoid saturation */ + if (omap_rev() != OMAP4430_REV_ES1_0) { + ctrl = omap_mcpdm_read(mcpdm, MCPDM_CTRL); + omap_mcpdm_write(mcpdm, MCPDM_CTRL, ctrl | WD_EN); + } + } + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + mcpdm->dl_active++; + omap_mcpdm_playback_open(mcpdm); + } else { + mcpdm->ul_active++; + omap_mcpdm_capture_open(mcpdm); + } + + if (dai->id > 1) + mcpdm->abe_mode[substream->stream] = 1; + else + mcpdm->abe_mode[substream->stream] = 0; + + mutex_unlock(&mcpdm->mutex); return err; } -static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) +/* work to delay McPDM shutdown */ +static void playback_work(struct work_struct *work) { - if (!dai->active) - omap_mcpdm_free(); + struct omap_mcpdm *mcpdm = + container_of(work, struct omap_mcpdm, delayed_work.work); + + mutex_lock(&mcpdm->mutex); + + if (!mcpdm->dl_active) { + + /* ABE playback stop handled by delayed work */ + if (mcpdm->abe_mode[SNDRV_PCM_STREAM_PLAYBACK]) { + omap_abe_port_disable(mcpdm->abe, mcpdm->dl_port); + udelay(250); + omap_mcpdm_stop(mcpdm, SNDRV_PCM_STREAM_PLAYBACK); + omap_mcpdm_playback_close(mcpdm); + abe_dsp_shutdown(); + abe_dsp_pm_put(); + } else + omap_mcpdm_playback_close(mcpdm); + } + + if (!mcpdm->dl_active && !mcpdm->ul_active) + pm_runtime_put_sync(mcpdm->dev); + + mutex_unlock(&mcpdm->mutex); } -static int omap_mcpdm_dai_trigger(struct snd_pcm_substream *substream, int cmd, - struct snd_soc_dai *dai) +static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) { - struct omap_mcpdm_data *mcpdm_priv = snd_soc_dai_get_drvdata(dai); - int stream = substream->stream; - int err = 0; + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (!mcpdm_priv->active++) - omap_mcpdm_start(stream); - break; + dev_dbg(dai->dev, "%s: active %d\n", __func__, dai->active); - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (!--mcpdm_priv->active) - omap_mcpdm_stop(stream); - break; - default: - err = -EINVAL; + mutex_lock(&mcpdm->mutex); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { + if (!--mcpdm->ul_active) { + omap_mcpdm_capture_close(mcpdm); + + /* power down if McPDM is not running */ + if (!omap_mcpdm_active(mcpdm)) + pm_runtime_put_sync(mcpdm->dev); + } + } else { + if (!--mcpdm->dl_active) + schedule_delayed_work(&mcpdm->delayed_work, + msecs_to_jiffies(1000)); /* TODO: pdata ? */ } - return err; + mutex_unlock(&mcpdm->mutex); } static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct omap_mcpdm_data *mcpdm_priv = snd_soc_dai_get_drvdata(dai); - struct omap_mcpdm_link *mcpdm_links = mcpdm_priv->links; + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); int stream = substream->stream; - int channels, err, link_mask = 0; + int channels, link_mask = 0; snd_soc_dai_set_dma_data(dai, substream, &omap_mcpdm_dai_dma_params[stream]); + /* ABE DAIs have fixed channels and IDs > MCPDM_LEGACY_DAI_DL1 */ + if (dai->id > MCPDM_LEGACY_DAI_DL1) { + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + mcpdm->dn_channels = PDM_DN_MASK | PDM_CMD_MASK; + else + mcpdm->up_channels = PDM_UP1_EN | PDM_UP2_EN; + return 0; + } + channels = params_channels(params); switch (channels) { case 4: @@ -164,58 +541,143 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - if (stream == SNDRV_PCM_STREAM_PLAYBACK) { - mcpdm_links[stream].channels = link_mask << 3; - err = omap_mcpdm_playback_open(&mcpdm_links[stream]); - } else { - mcpdm_links[stream].channels = link_mask << 0; - err = omap_mcpdm_capture_open(&mcpdm_links[stream]); - } + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + /* Downlink channels */ + mcpdm->dn_channels = (link_mask << 3) & (PDM_DN_MASK | PDM_CMD_MASK); + else + /* Uplink channels */ + mcpdm->up_channels = link_mask & (PDM_UP_MASK | PDM_STATUS_MASK); - return err; + return 0; } -static int omap_mcpdm_dai_hw_free(struct snd_pcm_substream *substream, +static int omap_mcpdm_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct omap_mcpdm_data *mcpdm_priv = snd_soc_dai_get_drvdata(dai); - struct omap_mcpdm_link *mcpdm_links = mcpdm_priv->links; + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); + + /* We only need to prepare for ABE playback */ + if (dai->id < MCPDM_ABE_DAI_DL1) + return 0; + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + + /* Check if ABE McPDM DL is already started */ + if (omap_abe_port_is_enabled(mcpdm->abe, mcpdm->dl_port)) + return 0; + + abe_dsp_pm_get(); + + /* start ATC before McPDM IP */ + omap_abe_port_enable(mcpdm->abe, mcpdm->dl_port); + + /* wait 250us for ABE tick */ + udelay(250); + + omap_mcpdm_start(mcpdm, SNDRV_PCM_STREAM_PLAYBACK); + } + + return 0; +} + +static int omap_mcpdm_dai_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); int stream = substream->stream; - int err; - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - err = omap_mcpdm_playback_close(&mcpdm_links[stream]); - else - err = omap_mcpdm_capture_close(&mcpdm_links[stream]); + dev_dbg(dai->dev, "cmd %d\n", cmd); - return err; + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + /* ABE playback start handled by hw_params to prevent pop-noise */ + if (dai->id == MCPDM_ABE_DAI_DL1 || + dai->id == MCPDM_ABE_DAI_DL2 || + dai->id == MCPDM_ABE_DAI_VIB) + return 0; + omap_mcpdm_start(mcpdm, stream); + break; + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + break; + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + break; + case SNDRV_PCM_TRIGGER_STOP: + /* ABE playback stop handled by delayed work */ + if (dai->id == MCPDM_ABE_DAI_DL1 || + dai->id == MCPDM_ABE_DAI_DL2 || + dai->id == MCPDM_ABE_DAI_VIB) + return 0; + omap_mcpdm_stop(mcpdm, stream); + break; + default: + break; + } + omap_mcpdm_reg_dump(mcpdm); + return 0; } static struct snd_soc_dai_ops omap_mcpdm_dai_ops = { .startup = omap_mcpdm_dai_startup, .shutdown = omap_mcpdm_dai_shutdown, - .trigger = omap_mcpdm_dai_trigger, .hw_params = omap_mcpdm_dai_hw_params, - .hw_free = omap_mcpdm_dai_hw_free, + .prepare = omap_mcpdm_prepare, + .trigger = omap_mcpdm_dai_trigger, }; -#define OMAP_MCPDM_RATES (SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) -#define OMAP_MCPDM_FORMATS (SNDRV_PCM_FMTBIT_S32_LE) +static int omap_mcpdm_probe(struct snd_soc_dai *dai) +{ + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); + int ret; -static int omap_mcpdm_dai_probe(struct snd_soc_dai *dai) + pm_runtime_enable(mcpdm->dev); + + /* Disable lines while request is ongoing */ + pm_runtime_get_sync(mcpdm->dev); + omap_mcpdm_write(mcpdm, MCPDM_CTRL, 0x00); + + ret = request_irq(mcpdm->irq, omap_mcpdm_irq_handler, + 0, "McPDM", (void *)mcpdm); + if (ret) + dev_err(mcpdm->dev, "Request for McPDM IRQ failed\n"); + + pm_runtime_put_sync(mcpdm->dev); + return ret; +} + +static int omap_mcpdm_remove(struct snd_soc_dai *dai) { - snd_soc_dai_set_drvdata(dai, &mcpdm_data); + struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); + + free_irq(mcpdm->irq, (void *)mcpdm); + pm_runtime_disable(mcpdm->dev); + return 0; } -static struct snd_soc_dai_driver omap_mcpdm_dai = { - .probe = omap_mcpdm_dai_probe, +#define OMAP_MCPDM_RATES (SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) +#define OMAP_MCPDM_FORMATS SNDRV_PCM_FMTBIT_S32_LE + +static struct snd_soc_dai_driver omap_mcpdm_dai[] = { +{ + .name = "mcpdm-dl", + .id = MCPDM_LEGACY_DAI_DL1, + .probe = omap_mcpdm_probe, + .remove = omap_mcpdm_remove, + .late_probe = 1, + .early_remove = 1, .playback = { .channels_min = 1, .channels_max = 4, .rates = OMAP_MCPDM_RATES, .formats = OMAP_MCPDM_FORMATS, }, + .ops = &omap_mcpdm_dai_ops, +}, +{ + .name = "mcpdm-ul", + .id = MCPDM_LEGACY_DAI_UL1, + .late_probe = 1, + .early_remove = 1, .capture = { .channels_min = 1, .channels_max = 2, @@ -223,31 +685,166 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = { .formats = OMAP_MCPDM_FORMATS, }, .ops = &omap_mcpdm_dai_ops, -}; +}, +#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) ||\ + defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) +{ + .name = "mcpdm-dl1", + .id = MCPDM_ABE_DAI_DL1, + .late_probe = 1, + .early_remove = 1, + .playback = { + .channels_min = 1, + .channels_max = 2, + .rates = OMAP_MCPDM_RATES, + .formats = OMAP_MCPDM_FORMATS, + }, + .ops = &omap_mcpdm_dai_ops, +}, +{ + .name = "mcpdm-dl2", + .id = MCPDM_ABE_DAI_DL2, + .late_probe = 1, + .early_remove = 1, + .playback = { + .channels_min = 1, + .channels_max = 2, + .rates = OMAP_MCPDM_RATES, + .formats = OMAP_MCPDM_FORMATS, + }, + .ops = &omap_mcpdm_dai_ops, +}, +{ + .name = "mcpdm-vib", + .id = MCPDM_ABE_DAI_VIB, + .late_probe = 1, + .early_remove = 1, + .playback = { + .channels_min = 1, + .channels_max = 2, + .rates = OMAP_MCPDM_RATES, + .formats = OMAP_MCPDM_FORMATS, + }, + .ops = &omap_mcpdm_dai_ops, +}, +{ + .name = "mcpdm-ul1", + .id = MCPDM_ABE_DAI_UL1, + .late_probe = 1, + .early_remove = 1, + .capture = { + .channels_min = 1, + .channels_max = 2, + .rates = OMAP_MCPDM_RATES, + .formats = OMAP_MCPDM_FORMATS, + }, + .ops = &omap_mcpdm_dai_ops, +}, +#endif + }; static __devinit int asoc_mcpdm_probe(struct platform_device *pdev) { - int ret; + struct omap_mcpdm *mcpdm; + struct resource *res; + int ret = 0, err; - ret = omap_mcpdm_probe(pdev); - if (ret < 0) - return ret; - ret = snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); - if (ret < 0) - omap_mcpdm_remove(pdev); + mcpdm = kzalloc(sizeof(struct omap_mcpdm), GFP_KERNEL); + if (!mcpdm) + return -ENOMEM; + + platform_set_drvdata(pdev, mcpdm); + + mutex_init(&mcpdm->mutex); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res == NULL) { + dev_err(&pdev->dev, "no resource\n"); + goto err_res; + } + + mcpdm->io_base = ioremap(res->start, resource_size(res)); + if (!mcpdm->io_base) { + ret = -ENOMEM; + goto err_iomap; + } + + mcpdm->irq = platform_get_irq(pdev, 0); + if (mcpdm->irq < 0) { + ret = mcpdm->irq; + goto err_irq; + } + + mcpdm->dev = &pdev->dev; + + /* DL1 and DL2 DC offset values will be different for each device */ + mcpdm->dl1_offset = DN_OFST_MAX >> 1; + mcpdm->dl2_offset = DN_OFST_MAX >> 1; + err = device_create_file(mcpdm->dev, &dev_attr_dl1); + if (err < 0) + dev_err(mcpdm->dev,"failed to DL1 DC offset sysfs: %d\n", err); + err = device_create_file(mcpdm->dev, &dev_attr_dl2); + if (err < 0) + dev_err(mcpdm->dev,"failed to DL2 DC offset sysfs: %d\n", err); + + INIT_DELAYED_WORK(&mcpdm->delayed_work, playback_work); + +#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) ||\ + defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) + + mcpdm->abe = omap_abe_port_mgr_get(); + + mcpdm->dl_port = omap_abe_port_open(mcpdm->abe, OMAP_ABE_BE_PORT_PDM_DL1); + if (mcpdm->dl_port == NULL) + goto err_irq; +#endif + + ret = snd_soc_register_dais(&pdev->dev, omap_mcpdm_dai, + ARRAY_SIZE(omap_mcpdm_dai)); + if (ret == 0) + return 0; + +#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) ||\ + defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) + omap_abe_port_close(mcpdm->abe, mcpdm->dl_port); +#endif +err_irq: + iounmap(mcpdm->io_base); +err_iomap: + release_mem_region(res->start, resource_size(res)); +err_res: + kfree(mcpdm); return ret; } static int __devexit asoc_mcpdm_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); - omap_mcpdm_remove(pdev); + struct omap_mcpdm *mcpdm = platform_get_drvdata(pdev); + struct resource *res; + + flush_delayed_work_sync(&mcpdm->delayed_work); + + snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(omap_mcpdm_dai)); + + device_remove_file(&pdev->dev, &dev_attr_dl1); + device_remove_file(&pdev->dev, &dev_attr_dl2); + +#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) ||\ + defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) + omap_abe_port_close(mcpdm->abe, mcpdm->dl_port); + omap_abe_port_mgr_put(mcpdm->abe); +#endif + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iounmap(mcpdm->io_base); + + kfree(mcpdm); return 0; } static struct platform_driver asoc_mcpdm_driver = { .driver = { - .name = "omap-mcpdm-dai", + .name = "omap-mcpdm", .owner = THIS_MODULE, }, |