ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 8 Nov 2018 07:29:58 +0000 (09:29 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 13 Nov 2018 17:50:24 +0000 (09:50 -0800)
The mcbsp.c was copied a while back from arch/arm/plat-omap/mcbsp.c and it
contained a mix of McBSP and McBSP sidetone functions.

Create new file structure with the following split:
omap-mcbsp.c - McBSP related functions
omap-mcbsp-st.c - McBSP sidetone functionality
omap-mcbsp-priv.h - Private header for internal use
omap-mcbsp.h - Header for user drivers

I have tried to do the code move with minimal code change, cleanup patches
can be based on the new structure.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/omap/Makefile
sound/soc/omap/mcbsp.c [deleted file]
sound/soc/omap/mcbsp.h [deleted file]
sound/soc/omap/omap-mcbsp-priv.h [new file with mode: 0644]
sound/soc/omap/omap-mcbsp-st.c [new file with mode: 0644]
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.h

index af50cdd..d005338 100644 (file)
@@ -2,7 +2,7 @@
 # OMAP Platform Support
 snd-soc-sdma-objs := sdma-pcm.o
 snd-soc-omap-dmic-objs := omap-dmic.o
-snd-soc-omap-mcbsp-objs := omap-mcbsp.o mcbsp.o
+snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o
 snd-soc-omap-mcpdm-objs := omap-mcpdm.o
 snd-soc-omap-hdmi-audio-objs := omap-hdmi-audio.o
 
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
deleted file mode 100644 (file)
index b19168f..0000000
+++ /dev/null
@@ -1,1094 +0,0 @@
-/*
- * sound/soc/omap/mcbsp.c
- *
- * Copyright (C) 2004 Nokia Corporation
- * Author: Samuel Ortiz <samuel.ortiz@nokia.com>
- *
- * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
- *          Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * 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.
- *
- * Multichannel mode not supported.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/pm_runtime.h>
-
-#include <linux/platform_data/asoc-ti-mcbsp.h>
-
-#include "mcbsp.h"
-
-static void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)
-{
-       void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step;
-
-       if (mcbsp->pdata->reg_size == 2) {
-               ((u16 *)mcbsp->reg_cache)[reg] = (u16)val;
-               writew_relaxed((u16)val, addr);
-       } else {
-               ((u32 *)mcbsp->reg_cache)[reg] = val;
-               writel_relaxed(val, addr);
-       }
-}
-
-static int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache)
-{
-       void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step;
-
-       if (mcbsp->pdata->reg_size == 2) {
-               return !from_cache ? readw_relaxed(addr) :
-                                    ((u16 *)mcbsp->reg_cache)[reg];
-       } else {
-               return !from_cache ? readl_relaxed(addr) :
-                                    ((u32 *)mcbsp->reg_cache)[reg];
-       }
-}
-
-static void omap_mcbsp_st_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)
-{
-       writel_relaxed(val, mcbsp->st_data->io_base_st + reg);
-}
-
-static int omap_mcbsp_st_read(struct omap_mcbsp *mcbsp, u16 reg)
-{
-       return readl_relaxed(mcbsp->st_data->io_base_st + reg);
-}
-
-#define MCBSP_READ(mcbsp, reg) \
-               omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 0)
-#define MCBSP_WRITE(mcbsp, reg, val) \
-               omap_mcbsp_write(mcbsp, OMAP_MCBSP_REG_##reg, val)
-#define MCBSP_READ_CACHE(mcbsp, reg) \
-               omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 1)
-
-#define MCBSP_ST_READ(mcbsp, reg) \
-                       omap_mcbsp_st_read(mcbsp, OMAP_ST_REG_##reg)
-#define MCBSP_ST_WRITE(mcbsp, reg, val) \
-                       omap_mcbsp_st_write(mcbsp, OMAP_ST_REG_##reg, val)
-
-static void omap_mcbsp_dump_reg(struct omap_mcbsp *mcbsp)
-{
-       dev_dbg(mcbsp->dev, "**** McBSP%d regs ****\n", mcbsp->id);
-       dev_dbg(mcbsp->dev, "DRR2:  0x%04x\n",
-                       MCBSP_READ(mcbsp, DRR2));
-       dev_dbg(mcbsp->dev, "DRR1:  0x%04x\n",
-                       MCBSP_READ(mcbsp, DRR1));
-       dev_dbg(mcbsp->dev, "DXR2:  0x%04x\n",
-                       MCBSP_READ(mcbsp, DXR2));
-       dev_dbg(mcbsp->dev, "DXR1:  0x%04x\n",
-                       MCBSP_READ(mcbsp, DXR1));
-       dev_dbg(mcbsp->dev, "SPCR2: 0x%04x\n",
-                       MCBSP_READ(mcbsp, SPCR2));
-       dev_dbg(mcbsp->dev, "SPCR1: 0x%04x\n",
-                       MCBSP_READ(mcbsp, SPCR1));
-       dev_dbg(mcbsp->dev, "RCR2:  0x%04x\n",
-                       MCBSP_READ(mcbsp, RCR2));
-       dev_dbg(mcbsp->dev, "RCR1:  0x%04x\n",
-                       MCBSP_READ(mcbsp, RCR1));
-       dev_dbg(mcbsp->dev, "XCR2:  0x%04x\n",
-                       MCBSP_READ(mcbsp, XCR2));
-       dev_dbg(mcbsp->dev, "XCR1:  0x%04x\n",
-                       MCBSP_READ(mcbsp, XCR1));
-       dev_dbg(mcbsp->dev, "SRGR2: 0x%04x\n",
-                       MCBSP_READ(mcbsp, SRGR2));
-       dev_dbg(mcbsp->dev, "SRGR1: 0x%04x\n",
-                       MCBSP_READ(mcbsp, SRGR1));
-       dev_dbg(mcbsp->dev, "PCR0:  0x%04x\n",
-                       MCBSP_READ(mcbsp, PCR0));
-       dev_dbg(mcbsp->dev, "***********************\n");
-}
-
-static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data)
-{
-       struct omap_mcbsp *mcbsp = data;
-       u16 irqst;
-
-       irqst = MCBSP_READ(mcbsp, IRQST);
-       dev_dbg(mcbsp->dev, "IRQ callback : 0x%x\n", irqst);
-
-       if (irqst & RSYNCERREN)
-               dev_err(mcbsp->dev, "RX Frame Sync Error!\n");
-       if (irqst & RFSREN)
-               dev_dbg(mcbsp->dev, "RX Frame Sync\n");
-       if (irqst & REOFEN)
-               dev_dbg(mcbsp->dev, "RX End Of Frame\n");
-       if (irqst & RRDYEN)
-               dev_dbg(mcbsp->dev, "RX Buffer Threshold Reached\n");
-       if (irqst & RUNDFLEN)
-               dev_err(mcbsp->dev, "RX Buffer Underflow!\n");
-       if (irqst & ROVFLEN)
-               dev_err(mcbsp->dev, "RX Buffer Overflow!\n");
-
-       if (irqst & XSYNCERREN)
-               dev_err(mcbsp->dev, "TX Frame Sync Error!\n");
-       if (irqst & XFSXEN)
-               dev_dbg(mcbsp->dev, "TX Frame Sync\n");
-       if (irqst & XEOFEN)
-               dev_dbg(mcbsp->dev, "TX End Of Frame\n");
-       if (irqst & XRDYEN)
-               dev_dbg(mcbsp->dev, "TX Buffer threshold Reached\n");
-       if (irqst & XUNDFLEN)
-               dev_err(mcbsp->dev, "TX Buffer Underflow!\n");
-       if (irqst & XOVFLEN)
-               dev_err(mcbsp->dev, "TX Buffer Overflow!\n");
-       if (irqst & XEMPTYEOFEN)
-               dev_dbg(mcbsp->dev, "TX Buffer empty at end of frame\n");
-
-       MCBSP_WRITE(mcbsp, IRQST, irqst);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *data)
-{
-       struct omap_mcbsp *mcbsp = data;
-       u16 irqst_spcr2;
-
-       irqst_spcr2 = MCBSP_READ(mcbsp, SPCR2);
-       dev_dbg(mcbsp->dev, "TX IRQ callback : 0x%x\n", irqst_spcr2);
-
-       if (irqst_spcr2 & XSYNC_ERR) {
-               dev_err(mcbsp->dev, "TX Frame Sync Error! : 0x%x\n",
-                       irqst_spcr2);
-               /* Writing zero to XSYNC_ERR clears the IRQ */
-               MCBSP_WRITE(mcbsp, SPCR2, MCBSP_READ_CACHE(mcbsp, SPCR2));
-       }
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *data)
-{
-       struct omap_mcbsp *mcbsp = data;
-       u16 irqst_spcr1;
-
-       irqst_spcr1 = MCBSP_READ(mcbsp, SPCR1);
-       dev_dbg(mcbsp->dev, "RX IRQ callback : 0x%x\n", irqst_spcr1);
-
-       if (irqst_spcr1 & RSYNC_ERR) {
-               dev_err(mcbsp->dev, "RX Frame Sync Error! : 0x%x\n",
-                       irqst_spcr1);
-               /* Writing zero to RSYNC_ERR clears the IRQ */
-               MCBSP_WRITE(mcbsp, SPCR1, MCBSP_READ_CACHE(mcbsp, SPCR1));
-       }
-
-       return IRQ_HANDLED;
-}
-
-/*
- * omap_mcbsp_config simply write a config to the
- * appropriate McBSP.
- * You either call this function or set the McBSP registers
- * by yourself before calling omap_mcbsp_start().
- */
-void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
-                      const struct omap_mcbsp_reg_cfg *config)
-{
-       dev_dbg(mcbsp->dev, "Configuring McBSP%d  phys_base: 0x%08lx\n",
-                       mcbsp->id, mcbsp->phys_base);
-
-       /* We write the given config */
-       MCBSP_WRITE(mcbsp, SPCR2, config->spcr2);
-       MCBSP_WRITE(mcbsp, SPCR1, config->spcr1);
-       MCBSP_WRITE(mcbsp, RCR2, config->rcr2);
-       MCBSP_WRITE(mcbsp, RCR1, config->rcr1);
-       MCBSP_WRITE(mcbsp, XCR2, config->xcr2);
-       MCBSP_WRITE(mcbsp, XCR1, config->xcr1);
-       MCBSP_WRITE(mcbsp, SRGR2, config->srgr2);
-       MCBSP_WRITE(mcbsp, SRGR1, config->srgr1);
-       MCBSP_WRITE(mcbsp, MCR2, config->mcr2);
-       MCBSP_WRITE(mcbsp, MCR1, config->mcr1);
-       MCBSP_WRITE(mcbsp, PCR0, config->pcr0);
-       if (mcbsp->pdata->has_ccr) {
-               MCBSP_WRITE(mcbsp, XCCR, config->xccr);
-               MCBSP_WRITE(mcbsp, RCCR, config->rccr);
-       }
-       /* Enable wakeup behavior */
-       if (mcbsp->pdata->has_wakeup)
-               MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
-
-       /* Enable TX/RX sync error interrupts by default */
-       if (mcbsp->irq)
-               MCBSP_WRITE(mcbsp, IRQEN, RSYNCERREN | XSYNCERREN |
-                           RUNDFLEN | ROVFLEN | XUNDFLEN | XOVFLEN);
-}
-
-/**
- * omap_mcbsp_dma_reg_params - returns the address of mcbsp data register
- * @mcbsp: omap_mcbsp struct for the McBSP instance
- * @stream: Stream direction (playback/capture)
- *
- * Returns the address of mcbsp data transmit register or data receive register
- * to be used by DMA for transferring/receiving data
- */
-static int omap_mcbsp_dma_reg_params(struct omap_mcbsp *mcbsp,
-                                    unsigned int stream)
-{
-       int data_reg;
-
-       if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-               if (mcbsp->pdata->reg_size == 2)
-                       data_reg = OMAP_MCBSP_REG_DXR1;
-               else
-                       data_reg = OMAP_MCBSP_REG_DXR;
-       } else {
-               if (mcbsp->pdata->reg_size == 2)
-                       data_reg = OMAP_MCBSP_REG_DRR1;
-               else
-                       data_reg = OMAP_MCBSP_REG_DRR;
-       }
-
-       return mcbsp->phys_dma_base + data_reg * mcbsp->pdata->reg_step;
-}
-
-static void omap_st_on(struct omap_mcbsp *mcbsp)
-{
-       unsigned int w;
-
-       if (mcbsp->pdata->force_ick_on)
-               mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, true);
-
-       /* Disable Sidetone clock auto-gating for normal operation */
-       w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
-       MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w & ~(ST_AUTOIDLE));
-
-       /* Enable McBSP Sidetone */
-       w = MCBSP_READ(mcbsp, SSELCR);
-       MCBSP_WRITE(mcbsp, SSELCR, w | SIDETONEEN);
-
-       /* Enable Sidetone from Sidetone Core */
-       w = MCBSP_ST_READ(mcbsp, SSELCR);
-       MCBSP_ST_WRITE(mcbsp, SSELCR, w | ST_SIDETONEEN);
-}
-
-static void omap_st_off(struct omap_mcbsp *mcbsp)
-{
-       unsigned int w;
-
-       w = MCBSP_ST_READ(mcbsp, SSELCR);
-       MCBSP_ST_WRITE(mcbsp, SSELCR, w & ~(ST_SIDETONEEN));
-
-       w = MCBSP_READ(mcbsp, SSELCR);
-       MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN));
-
-       /* Enable Sidetone clock auto-gating to reduce power consumption */
-       w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
-       MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w | ST_AUTOIDLE);
-
-       if (mcbsp->pdata->force_ick_on)
-               mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, false);
-}
-
-static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir)
-{
-       u16 val, i;
-
-       val = MCBSP_ST_READ(mcbsp, SSELCR);
-
-       if (val & ST_COEFFWREN)
-               MCBSP_ST_WRITE(mcbsp, SSELCR, val & ~(ST_COEFFWREN));
-
-       MCBSP_ST_WRITE(mcbsp, SSELCR, val | ST_COEFFWREN);
-
-       for (i = 0; i < 128; i++)
-               MCBSP_ST_WRITE(mcbsp, SFIRCR, fir[i]);
-
-       i = 0;
-
-       val = MCBSP_ST_READ(mcbsp, SSELCR);
-       while (!(val & ST_COEFFWRDONE) && (++i < 1000))
-               val = MCBSP_ST_READ(mcbsp, SSELCR);
-
-       MCBSP_ST_WRITE(mcbsp, SSELCR, val & ~(ST_COEFFWREN));
-
-       if (i == 1000)
-               dev_err(mcbsp->dev, "McBSP FIR load error!\n");
-}
-
-static void omap_st_chgain(struct omap_mcbsp *mcbsp)
-{
-       u16 w;
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-
-       w = MCBSP_ST_READ(mcbsp, SSELCR);
-
-       MCBSP_ST_WRITE(mcbsp, SGAINCR, ST_CH0GAIN(st_data->ch0gain) | \
-                     ST_CH1GAIN(st_data->ch1gain));
-}
-
-int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-       int ret = 0;
-
-       if (!st_data)
-               return -ENOENT;
-
-       spin_lock_irq(&mcbsp->lock);
-       if (channel == 0)
-               st_data->ch0gain = chgain;
-       else if (channel == 1)
-               st_data->ch1gain = chgain;
-       else
-               ret = -EINVAL;
-
-       if (st_data->enabled)
-               omap_st_chgain(mcbsp);
-       spin_unlock_irq(&mcbsp->lock);
-
-       return ret;
-}
-
-int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-       int ret = 0;
-
-       if (!st_data)
-               return -ENOENT;
-
-       spin_lock_irq(&mcbsp->lock);
-       if (channel == 0)
-               *chgain = st_data->ch0gain;
-       else if (channel == 1)
-               *chgain = st_data->ch1gain;
-       else
-               ret = -EINVAL;
-       spin_unlock_irq(&mcbsp->lock);
-
-       return ret;
-}
-
-static int omap_st_start(struct omap_mcbsp *mcbsp)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-
-       if (st_data->enabled && !st_data->running) {
-               omap_st_fir_write(mcbsp, st_data->taps);
-               omap_st_chgain(mcbsp);
-
-               if (!mcbsp->free) {
-                       omap_st_on(mcbsp);
-                       st_data->running = 1;
-               }
-       }
-
-       return 0;
-}
-
-int omap_st_enable(struct omap_mcbsp *mcbsp)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-
-       if (!st_data)
-               return -ENODEV;
-
-       spin_lock_irq(&mcbsp->lock);
-       st_data->enabled = 1;
-       omap_st_start(mcbsp);
-       spin_unlock_irq(&mcbsp->lock);
-
-       return 0;
-}
-
-static int omap_st_stop(struct omap_mcbsp *mcbsp)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-
-       if (st_data->running) {
-               if (!mcbsp->free) {
-                       omap_st_off(mcbsp);
-                       st_data->running = 0;
-               }
-       }
-
-       return 0;
-}
-
-int omap_st_disable(struct omap_mcbsp *mcbsp)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-       int ret = 0;
-
-       if (!st_data)
-               return -ENODEV;
-
-       spin_lock_irq(&mcbsp->lock);
-       omap_st_stop(mcbsp);
-       st_data->enabled = 0;
-       spin_unlock_irq(&mcbsp->lock);
-
-       return ret;
-}
-
-int omap_st_is_enabled(struct omap_mcbsp *mcbsp)
-{
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-
-       if (!st_data)
-               return -ENODEV;
-
-       return st_data->enabled;
-}
-
-/*
- * omap_mcbsp_set_rx_threshold configures the transmit threshold in words.
- * The threshold parameter is 1 based, and it is converted (threshold - 1)
- * for the THRSH2 register.
- */
-void omap_mcbsp_set_tx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
-{
-       if (threshold && threshold <= mcbsp->max_tx_thres)
-               MCBSP_WRITE(mcbsp, THRSH2, threshold - 1);
-}
-
-/*
- * omap_mcbsp_set_rx_threshold configures the receive threshold in words.
- * The threshold parameter is 1 based, and it is converted (threshold - 1)
- * for the THRSH1 register.
- */
-void omap_mcbsp_set_rx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
-{
-       if (threshold && threshold <= mcbsp->max_rx_thres)
-               MCBSP_WRITE(mcbsp, THRSH1, threshold - 1);
-}
-
-/*
- * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO
- */
-u16 omap_mcbsp_get_tx_delay(struct omap_mcbsp *mcbsp)
-{
-       u16 buffstat;
-
-       /* Returns the number of free locations in the buffer */
-       buffstat = MCBSP_READ(mcbsp, XBUFFSTAT);
-
-       /* Number of slots are different in McBSP ports */
-       return mcbsp->pdata->buffer_size - buffstat;
-}
-
-/*
- * omap_mcbsp_get_rx_delay returns the number of free slots in the McBSP FIFO
- * to reach the threshold value (when the DMA will be triggered to read it)
- */
-u16 omap_mcbsp_get_rx_delay(struct omap_mcbsp *mcbsp)
-{
-       u16 buffstat, threshold;
-
-       /* Returns the number of used locations in the buffer */
-       buffstat = MCBSP_READ(mcbsp, RBUFFSTAT);
-       /* RX threshold */
-       threshold = MCBSP_READ(mcbsp, THRSH1);
-
-       /* Return the number of location till we reach the threshold limit */
-       if (threshold <= buffstat)
-               return 0;
-       else
-               return threshold - buffstat;
-}
-
-int omap_mcbsp_request(struct omap_mcbsp *mcbsp)
-{
-       void *reg_cache;
-       int err;
-
-       reg_cache = kzalloc(mcbsp->reg_cache_size, GFP_KERNEL);
-       if (!reg_cache) {
-               return -ENOMEM;
-       }
-
-       spin_lock(&mcbsp->lock);
-       if (!mcbsp->free) {
-               dev_err(mcbsp->dev, "McBSP%d is currently in use\n",
-                       mcbsp->id);
-               err = -EBUSY;
-               goto err_kfree;
-       }
-
-       mcbsp->free = false;
-       mcbsp->reg_cache = reg_cache;
-       spin_unlock(&mcbsp->lock);
-
-       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
-               mcbsp->pdata->ops->request(mcbsp->id - 1);
-
-       /*
-        * Make sure that transmitter, receiver and sample-rate generator are
-        * not running before activating IRQs.
-        */
-       MCBSP_WRITE(mcbsp, SPCR1, 0);
-       MCBSP_WRITE(mcbsp, SPCR2, 0);
-
-       if (mcbsp->irq) {
-               err = request_irq(mcbsp->irq, omap_mcbsp_irq_handler, 0,
-                                 "McBSP", (void *)mcbsp);
-               if (err != 0) {
-                       dev_err(mcbsp->dev, "Unable to request IRQ\n");
-                       goto err_clk_disable;
-               }
-       } else {
-               err = request_irq(mcbsp->tx_irq, omap_mcbsp_tx_irq_handler, 0,
-                                 "McBSP TX", (void *)mcbsp);
-               if (err != 0) {
-                       dev_err(mcbsp->dev, "Unable to request TX IRQ\n");
-                       goto err_clk_disable;
-               }
-
-               err = request_irq(mcbsp->rx_irq, omap_mcbsp_rx_irq_handler, 0,
-                                 "McBSP RX", (void *)mcbsp);
-               if (err != 0) {
-                       dev_err(mcbsp->dev, "Unable to request RX IRQ\n");
-                       goto err_free_irq;
-               }
-       }
-
-       return 0;
-err_free_irq:
-       free_irq(mcbsp->tx_irq, (void *)mcbsp);
-err_clk_disable:
-       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
-               mcbsp->pdata->ops->free(mcbsp->id - 1);
-
-       /* Disable wakeup behavior */
-       if (mcbsp->pdata->has_wakeup)
-               MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
-
-       spin_lock(&mcbsp->lock);
-       mcbsp->free = true;
-       mcbsp->reg_cache = NULL;
-err_kfree:
-       spin_unlock(&mcbsp->lock);
-       kfree(reg_cache);
-
-       return err;
-}
-
-void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
-{
-       void *reg_cache;
-
-       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
-               mcbsp->pdata->ops->free(mcbsp->id - 1);
-
-       /* Disable wakeup behavior */
-       if (mcbsp->pdata->has_wakeup)
-               MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
-
-       /* Disable interrupt requests */
-       if (mcbsp->irq)
-               MCBSP_WRITE(mcbsp, IRQEN, 0);
-
-       if (mcbsp->irq) {
-               free_irq(mcbsp->irq, (void *)mcbsp);
-       } else {
-               free_irq(mcbsp->rx_irq, (void *)mcbsp);
-               free_irq(mcbsp->tx_irq, (void *)mcbsp);
-       }
-
-       reg_cache = mcbsp->reg_cache;
-
-       /*
-        * Select CLKS source from internal source unconditionally before
-        * marking the McBSP port as free.
-        * If the external clock source via MCBSP_CLKS pin has been selected the
-        * system will refuse to enter idle if the CLKS pin source is not reset
-        * back to internal source.
-        */
-       if (!mcbsp_omap1())
-               omap2_mcbsp_set_clks_src(mcbsp, MCBSP_CLKS_PRCM_SRC);
-
-       spin_lock(&mcbsp->lock);
-       if (mcbsp->free)
-               dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id);
-       else
-               mcbsp->free = true;
-       mcbsp->reg_cache = NULL;
-       spin_unlock(&mcbsp->lock);
-
-       kfree(reg_cache);
-}
-
-/*
- * Here we start the McBSP, by enabling transmitter, receiver or both.
- * If no transmitter or receiver is active prior calling, then sample-rate
- * generator and frame sync are started.
- */
-void omap_mcbsp_start(struct omap_mcbsp *mcbsp, int stream)
-{
-       int tx = (stream == SNDRV_PCM_STREAM_PLAYBACK);
-       int rx = !tx;
-       int enable_srg = 0;
-       u16 w;
-
-       if (mcbsp->st_data)
-               omap_st_start(mcbsp);
-
-       /* Only enable SRG, if McBSP is master */
-       w = MCBSP_READ_CACHE(mcbsp, PCR0);
-       if (w & (FSXM | FSRM | CLKXM | CLKRM))
-               enable_srg = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
-                               MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
-
-       if (enable_srg) {
-               /* Start the sample generator */
-               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
-               MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 6));
-       }
-
-       /* Enable transmitter and receiver */
-       tx &= 1;
-       w = MCBSP_READ_CACHE(mcbsp, SPCR2);
-       MCBSP_WRITE(mcbsp, SPCR2, w | tx);
-
-       rx &= 1;
-       w = MCBSP_READ_CACHE(mcbsp, SPCR1);
-       MCBSP_WRITE(mcbsp, SPCR1, w | rx);
-
-       /*
-        * Worst case: CLKSRG*2 = 8000khz: (1/8000) * 2 * 2 usec
-        * REVISIT: 100us may give enough time for two CLKSRG, however
-        * due to some unknown PM related, clock gating etc. reason it
-        * is now at 500us.
-        */
-       udelay(500);
-
-       if (enable_srg) {
-               /* Start frame sync */
-               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
-               MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 7));
-       }
-
-       if (mcbsp->pdata->has_ccr) {
-               /* Release the transmitter and receiver */
-               w = MCBSP_READ_CACHE(mcbsp, XCCR);
-               w &= ~(tx ? XDISABLE : 0);
-               MCBSP_WRITE(mcbsp, XCCR, w);
-               w = MCBSP_READ_CACHE(mcbsp, RCCR);
-               w &= ~(rx ? RDISABLE : 0);
-               MCBSP_WRITE(mcbsp, RCCR, w);
-       }
-
-       /* Dump McBSP Regs */
-       omap_mcbsp_dump_reg(mcbsp);
-}
-
-void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int stream)
-{
-       int tx = (stream == SNDRV_PCM_STREAM_PLAYBACK);
-       int rx = !tx;
-       int idle;
-       u16 w;
-
-       /* Reset transmitter */
-       tx &= 1;
-       if (mcbsp->pdata->has_ccr) {
-               w = MCBSP_READ_CACHE(mcbsp, XCCR);
-               w |= (tx ? XDISABLE : 0);
-               MCBSP_WRITE(mcbsp, XCCR, w);
-       }
-       w = MCBSP_READ_CACHE(mcbsp, SPCR2);
-       MCBSP_WRITE(mcbsp, SPCR2, w & ~tx);
-
-       /* Reset receiver */
-       rx &= 1;
-       if (mcbsp->pdata->has_ccr) {
-               w = MCBSP_READ_CACHE(mcbsp, RCCR);
-               w |= (rx ? RDISABLE : 0);
-               MCBSP_WRITE(mcbsp, RCCR, w);
-       }
-       w = MCBSP_READ_CACHE(mcbsp, SPCR1);
-       MCBSP_WRITE(mcbsp, SPCR1, w & ~rx);
-
-       idle = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
-                       MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
-
-       if (idle) {
-               /* Reset the sample rate generator */
-               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
-               MCBSP_WRITE(mcbsp, SPCR2, w & ~(1 << 6));
-       }
-
-       if (mcbsp->st_data)
-               omap_st_stop(mcbsp);
-}
-
-int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
-{
-       struct clk *fck_src;
-       const char *src;
-       int r;
-
-       if (fck_src_id == MCBSP_CLKS_PAD_SRC)
-               src = "pad_fck";
-       else if (fck_src_id == MCBSP_CLKS_PRCM_SRC)
-               src = "prcm_fck";
-       else
-               return -EINVAL;
-
-       fck_src = clk_get(mcbsp->dev, src);
-       if (IS_ERR(fck_src)) {
-               dev_err(mcbsp->dev, "CLKS: could not clk_get() %s\n", src);
-               return -EINVAL;
-       }
-
-       pm_runtime_put_sync(mcbsp->dev);
-
-       r = clk_set_parent(mcbsp->fclk, fck_src);
-       if (r) {
-               dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n",
-                       src);
-               clk_put(fck_src);
-               return r;
-       }
-
-       pm_runtime_get_sync(mcbsp->dev);
-
-       clk_put(fck_src);
-
-       return 0;
-
-}
-
-#define max_thres(m)                   (mcbsp->pdata->buffer_size)
-#define valid_threshold(m, val)                ((val) <= max_thres(m))
-#define THRESHOLD_PROP_BUILDER(prop)                                   \
-static ssize_t prop##_show(struct device *dev,                         \
-                       struct device_attribute *attr, char *buf)       \
-{                                                                      \
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);                \
-                                                                       \
-       return sprintf(buf, "%u\n", mcbsp->prop);                       \
-}                                                                      \
-                                                                       \
-static ssize_t prop##_store(struct device *dev,                                \
-                               struct device_attribute *attr,          \
-                               const char *buf, size_t size)           \
-{                                                                      \
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);                \
-       unsigned long val;                                              \
-       int status;                                                     \
-                                                                       \
-       status = kstrtoul(buf, 0, &val);                                \
-       if (status)                                                     \
-               return status;                                          \
-                                                                       \
-       if (!valid_threshold(mcbsp, val))                               \
-               return -EDOM;                                           \
-                                                                       \
-       mcbsp->prop = val;                                              \
-       return size;                                                    \
-}                                                                      \
-                                                                       \
-static DEVICE_ATTR(prop, 0644, prop##_show, prop##_store);
-
-THRESHOLD_PROP_BUILDER(max_tx_thres);
-THRESHOLD_PROP_BUILDER(max_rx_thres);
-
-static const char *dma_op_modes[] = {
-       "element", "threshold",
-};
-
-static ssize_t dma_op_mode_show(struct device *dev,
-                       struct device_attribute *attr, char *buf)
-{
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
-       int dma_op_mode, i = 0;
-       ssize_t len = 0;
-       const char * const *s;
-
-       dma_op_mode = mcbsp->dma_op_mode;
-
-       for (s = &dma_op_modes[i]; i < ARRAY_SIZE(dma_op_modes); s++, i++) {
-               if (dma_op_mode == i)
-                       len += sprintf(buf + len, "[%s] ", *s);
-               else
-                       len += sprintf(buf + len, "%s ", *s);
-       }
-       len += sprintf(buf + len, "\n");
-
-       return len;
-}
-
-static ssize_t dma_op_mode_store(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t size)
-{
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
-       int i;
-
-       i = sysfs_match_string(dma_op_modes, buf);
-       if (i < 0)
-               return i;
-
-       spin_lock_irq(&mcbsp->lock);
-       if (!mcbsp->free) {
-               size = -EBUSY;
-               goto unlock;
-       }
-       mcbsp->dma_op_mode = i;
-
-unlock:
-       spin_unlock_irq(&mcbsp->lock);
-
-       return size;
-}
-
-static DEVICE_ATTR_RW(dma_op_mode);
-
-static const struct attribute *additional_attrs[] = {
-       &dev_attr_max_tx_thres.attr,
-       &dev_attr_max_rx_thres.attr,
-       &dev_attr_dma_op_mode.attr,
-       NULL,
-};
-
-static const struct attribute_group additional_attr_group = {
-       .attrs = (struct attribute **)additional_attrs,
-};
-
-static ssize_t st_taps_show(struct device *dev,
-                           struct device_attribute *attr, char *buf)
-{
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-       ssize_t status = 0;
-       int i;
-
-       spin_lock_irq(&mcbsp->lock);
-       for (i = 0; i < st_data->nr_taps; i++)
-               status += sprintf(&buf[status], (i ? ", %d" : "%d"),
-                                 st_data->taps[i]);
-       if (i)
-               status += sprintf(&buf[status], "\n");
-       spin_unlock_irq(&mcbsp->lock);
-
-       return status;
-}
-
-static ssize_t st_taps_store(struct device *dev,
-                            struct device_attribute *attr,
-                            const char *buf, size_t size)
-{
-       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
-       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
-       int val, tmp, status, i = 0;
-
-       spin_lock_irq(&mcbsp->lock);
-       memset(st_data->taps, 0, sizeof(st_data->taps));
-       st_data->nr_taps = 0;
-
-       do {
-               status = sscanf(buf, "%d%n", &val, &tmp);
-               if (status < 0 || status == 0) {
-                       size = -EINVAL;
-                       goto out;
-               }
-               if (val < -32768 || val > 32767) {
-                       size = -EINVAL;
-                       goto out;
-               }
-               st_data->taps[i++] = val;
-               buf += tmp;
-               if (*buf != ',')
-                       break;
-               buf++;
-       } while (1);
-
-       st_data->nr_taps = i;
-
-out:
-       spin_unlock_irq(&mcbsp->lock);
-
-       return size;
-}
-
-static DEVICE_ATTR_RW(st_taps);
-
-static const struct attribute *sidetone_attrs[] = {
-       &dev_attr_st_taps.attr,
-       NULL,
-};
-
-static const struct attribute_group sidetone_attr_group = {
-       .attrs = (struct attribute **)sidetone_attrs,
-};
-
-static int omap_st_add(struct omap_mcbsp *mcbsp, struct resource *res)
-{
-       struct omap_mcbsp_st_data *st_data;
-       int err;
-
-       st_data = devm_kzalloc(mcbsp->dev, sizeof(*mcbsp->st_data), GFP_KERNEL);
-       if (!st_data)
-               return -ENOMEM;
-
-       st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick");
-       if (IS_ERR(st_data->mcbsp_iclk)) {
-               dev_warn(mcbsp->dev,
-                        "Failed to get ick, sidetone might be broken\n");
-               st_data->mcbsp_iclk = NULL;
-       }
-
-       st_data->io_base_st = devm_ioremap(mcbsp->dev, res->start,
-                                          resource_size(res));
-       if (!st_data->io_base_st)
-               return -ENOMEM;
-
-       err = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group);
-       if (err)
-               return err;
-
-       mcbsp->st_data = st_data;
-       return 0;
-}
-
-/*
- * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.
- * 730 has only 2 McBSP, and both of them are MPU peripherals.
- */
-int omap_mcbsp_init(struct platform_device *pdev)
-{
-       struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
-       struct resource *res;
-       int ret = 0;
-
-       spin_lock_init(&mcbsp->lock);
-       mcbsp->free = true;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
-       if (!res)
-               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-       mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(mcbsp->io_base))
-               return PTR_ERR(mcbsp->io_base);
-
-       mcbsp->phys_base = res->start;
-       mcbsp->reg_cache_size = resource_size(res);
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");
-       if (!res)
-               mcbsp->phys_dma_base = mcbsp->phys_base;
-       else
-               mcbsp->phys_dma_base = res->start;
-
-       /*
-        * OMAP1, 2 uses two interrupt lines: TX, RX
-        * OMAP2430, OMAP3 SoC have combined IRQ line as well.
-        * OMAP4 and newer SoC only have the combined IRQ line.
-        * Use the combined IRQ if available since it gives better debugging
-        * possibilities.
-        */
-       mcbsp->irq = platform_get_irq_byname(pdev, "common");
-       if (mcbsp->irq == -ENXIO) {
-               mcbsp->tx_irq = platform_get_irq_byname(pdev, "tx");
-
-               if (mcbsp->tx_irq == -ENXIO) {
-                       mcbsp->irq = platform_get_irq(pdev, 0);
-                       mcbsp->tx_irq = 0;
-               } else {
-                       mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx");
-                       mcbsp->irq = 0;
-               }
-       }
-
-       if (!pdev->dev.of_node) {
-               res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
-               if (!res) {
-                       dev_err(&pdev->dev, "invalid tx DMA channel\n");
-                       return -ENODEV;
-               }
-               mcbsp->dma_req[0] = res->start;
-               mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
-
-               res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
-               if (!res) {
-                       dev_err(&pdev->dev, "invalid rx DMA channel\n");
-                       return -ENODEV;
-               }
-               mcbsp->dma_req[1] = res->start;
-               mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
-       } else {
-               mcbsp->dma_data[0].filter_data = "tx";
-               mcbsp->dma_data[1].filter_data = "rx";
-       }
-
-       mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp,
-                                               SNDRV_PCM_STREAM_PLAYBACK);
-       mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp,
-                                               SNDRV_PCM_STREAM_CAPTURE);
-
-       mcbsp->fclk = clk_get(&pdev->dev, "fck");
-       if (IS_ERR(mcbsp->fclk)) {
-               ret = PTR_ERR(mcbsp->fclk);
-               dev_err(mcbsp->dev, "unable to get fck: %d\n", ret);
-               return ret;
-       }
-
-       mcbsp->dma_op_mode = MCBSP_DMA_MODE_ELEMENT;
-       if (mcbsp->pdata->buffer_size) {
-               /*
-                * Initially configure the maximum thresholds to a safe value.
-                * The McBSP FIFO usage with these values should not go under
-                * 16 locations.
-                * If the whole FIFO without safety buffer is used, than there
-                * is a possibility that the DMA will be not able to push the
-                * new data on time, causing channel shifts in runtime.
-                */
-               mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10;
-               mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10;
-
-               ret = sysfs_create_group(&mcbsp->dev->kobj,
-                                        &additional_attr_group);
-               if (ret) {
-                       dev_err(mcbsp->dev,
-                               "Unable to create additional controls\n");
-                       goto err_thres;
-               }
-       } else {
-               mcbsp->max_tx_thres = -EINVAL;
-               mcbsp->max_rx_thres = -EINVAL;
-       }
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sidetone");
-       if (res) {
-               ret = omap_st_add(mcbsp, res);
-               if (ret) {
-                       dev_err(mcbsp->dev,
-                               "Unable to create sidetone controls\n");
-                       goto err_st;
-               }
-       }
-
-       return 0;
-
-err_st:
-       if (mcbsp->pdata->buffer_size)
-               sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
-err_thres:
-       clk_put(mcbsp->fclk);
-       return ret;
-}
-
-void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp)
-{
-       if (mcbsp->pdata->buffer_size)
-               sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
-
-       if (mcbsp->st_data) {
-               sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group);
-               clk_put(mcbsp->st_data->mcbsp_iclk);
-       }
-}
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
deleted file mode 100644 (file)
index 92472c6..0000000
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * sound/soc/omap/mcbsp.h
- *
- * OMAP Multi-Channel Buffered Serial Port
- *
- * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
- *          Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#ifndef __ASOC_MCBSP_H
-#define __ASOC_MCBSP_H
-
-#ifdef CONFIG_ARCH_OMAP1
-#define mcbsp_omap1()  1
-#else
-#define mcbsp_omap1()  0
-#endif
-
-#include <sound/dmaengine_pcm.h>
-
-/* McBSP register numbers. Register address offset = num * reg_step */
-enum {
-       /* Common registers */
-       OMAP_MCBSP_REG_SPCR2 = 4,
-       OMAP_MCBSP_REG_SPCR1,
-       OMAP_MCBSP_REG_RCR2,
-       OMAP_MCBSP_REG_RCR1,
-       OMAP_MCBSP_REG_XCR2,
-       OMAP_MCBSP_REG_XCR1,
-       OMAP_MCBSP_REG_SRGR2,
-       OMAP_MCBSP_REG_SRGR1,
-       OMAP_MCBSP_REG_MCR2,
-       OMAP_MCBSP_REG_MCR1,
-       OMAP_MCBSP_REG_RCERA,
-       OMAP_MCBSP_REG_RCERB,
-       OMAP_MCBSP_REG_XCERA,
-       OMAP_MCBSP_REG_XCERB,
-       OMAP_MCBSP_REG_PCR0,
-       OMAP_MCBSP_REG_RCERC,
-       OMAP_MCBSP_REG_RCERD,
-       OMAP_MCBSP_REG_XCERC,
-       OMAP_MCBSP_REG_XCERD,
-       OMAP_MCBSP_REG_RCERE,
-       OMAP_MCBSP_REG_RCERF,
-       OMAP_MCBSP_REG_XCERE,
-       OMAP_MCBSP_REG_XCERF,
-       OMAP_MCBSP_REG_RCERG,
-       OMAP_MCBSP_REG_RCERH,
-       OMAP_MCBSP_REG_XCERG,
-       OMAP_MCBSP_REG_XCERH,
-
-       /* OMAP1-OMAP2420 registers */
-       OMAP_MCBSP_REG_DRR2 = 0,
-       OMAP_MCBSP_REG_DRR1,
-       OMAP_MCBSP_REG_DXR2,
-       OMAP_MCBSP_REG_DXR1,
-
-       /* OMAP2430 and onwards */
-       OMAP_MCBSP_REG_DRR = 0,
-       OMAP_MCBSP_REG_DXR = 2,
-       OMAP_MCBSP_REG_SYSCON = 35,
-       OMAP_MCBSP_REG_THRSH2,
-       OMAP_MCBSP_REG_THRSH1,
-       OMAP_MCBSP_REG_IRQST = 40,
-       OMAP_MCBSP_REG_IRQEN,
-       OMAP_MCBSP_REG_WAKEUPEN,
-       OMAP_MCBSP_REG_XCCR,
-       OMAP_MCBSP_REG_RCCR,
-       OMAP_MCBSP_REG_XBUFFSTAT,
-       OMAP_MCBSP_REG_RBUFFSTAT,
-       OMAP_MCBSP_REG_SSELCR,
-};
-
-/* OMAP3 sidetone control registers */
-#define OMAP_ST_REG_REV                0x00
-#define OMAP_ST_REG_SYSCONFIG  0x10
-#define OMAP_ST_REG_IRQSTATUS  0x18
-#define OMAP_ST_REG_IRQENABLE  0x1C
-#define OMAP_ST_REG_SGAINCR    0x24
-#define OMAP_ST_REG_SFIRCR     0x28
-#define OMAP_ST_REG_SSELCR     0x2C
-
-/************************** McBSP SPCR1 bit definitions ***********************/
-#define RRST                   BIT(0)
-#define RRDY                   BIT(1)
-#define RFULL                  BIT(2)
-#define RSYNC_ERR              BIT(3)
-#define RINTM(value)           (((value) & 0x3) << 4)  /* bits 4:5 */
-#define ABIS                   BIT(6)
-#define DXENA                  BIT(7)
-#define CLKSTP(value)          (((value) & 0x3) << 11) /* bits 11:12 */
-#define RJUST(value)           (((value) & 0x3) << 13) /* bits 13:14 */
-#define ALB                    BIT(15)
-#define DLB                    BIT(15)
-
-/************************** McBSP SPCR2 bit definitions ***********************/
-#define XRST                   BIT(0)
-#define XRDY                   BIT(1)
-#define XEMPTY                 BIT(2)
-#define XSYNC_ERR              BIT(3)
-#define XINTM(value)           (((value) & 0x3) << 4)  /* bits 4:5 */
-#define GRST                   BIT(6)
-#define FRST                   BIT(7)
-#define SOFT                   BIT(8)
-#define FREE                   BIT(9)
-
-/************************** McBSP PCR bit definitions *************************/
-#define CLKRP                  BIT(0)
-#define CLKXP                  BIT(1)
-#define FSRP                   BIT(2)
-#define FSXP                   BIT(3)
-#define DR_STAT                        BIT(4)
-#define DX_STAT                        BIT(5)
-#define CLKS_STAT              BIT(6)
-#define SCLKME                 BIT(7)
-#define CLKRM                  BIT(8)
-#define CLKXM                  BIT(9)
-#define FSRM                   BIT(10)
-#define FSXM                   BIT(11)
-#define RIOEN                  BIT(12)
-#define XIOEN                  BIT(13)
-#define IDLE_EN                        BIT(14)
-
-/************************** McBSP RCR1 bit definitions ************************/
-#define RWDLEN1(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
-#define RFRLEN1(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
-
-/************************** McBSP XCR1 bit definitions ************************/
-#define XWDLEN1(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
-#define XFRLEN1(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
-
-/*************************** McBSP RCR2 bit definitions ***********************/
-#define RDATDLY(value)         ((value) & 0x3)         /* Bits 0:1 */
-#define RFIG                   BIT(2)
-#define RCOMPAND(value)                (((value) & 0x3) << 3)  /* Bits 3:4 */
-#define RWDLEN2(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
-#define RFRLEN2(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
-#define RPHASE                 BIT(15)
-
-/*************************** McBSP XCR2 bit definitions ***********************/
-#define XDATDLY(value)         ((value) & 0x3)         /* Bits 0:1 */
-#define XFIG                   BIT(2)
-#define XCOMPAND(value)                (((value) & 0x3) << 3)  /* Bits 3:4 */
-#define XWDLEN2(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
-#define XFRLEN2(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
-#define XPHASE                 BIT(15)
-
-/************************* McBSP SRGR1 bit definitions ************************/
-#define CLKGDV(value)          ((value) & 0x7f)                /* Bits 0:7 */
-#define FWID(value)            (((value) & 0xff) << 8) /* Bits 8:15 */
-
-/************************* McBSP SRGR2 bit definitions ************************/
-#define FPER(value)            ((value) & 0x0fff)      /* Bits 0:11 */
-#define FSGM                   BIT(12)
-#define CLKSM                  BIT(13)
-#define CLKSP                  BIT(14)
-#define GSYNC                  BIT(15)
-
-/************************* McBSP MCR1 bit definitions *************************/
-#define RMCM                   BIT(0)
-#define RCBLK(value)           (((value) & 0x7) << 2)  /* Bits 2:4 */
-#define RPABLK(value)          (((value) & 0x3) << 5)  /* Bits 5:6 */
-#define RPBBLK(value)          (((value) & 0x3) << 7)  /* Bits 7:8 */
-
-/************************* McBSP MCR2 bit definitions *************************/
-#define XMCM(value)            ((value) & 0x3)         /* Bits 0:1 */
-#define XCBLK(value)           (((value) & 0x7) << 2)  /* Bits 2:4 */
-#define XPABLK(value)          (((value) & 0x3) << 5)  /* Bits 5:6 */
-#define XPBBLK(value)          (((value) & 0x3) << 7)  /* Bits 7:8 */
-
-/*********************** McBSP XCCR bit definitions *************************/
-#define XDISABLE               BIT(0)
-#define XDMAEN                 BIT(3)
-#define DILB                   BIT(5)
-#define XFULL_CYCLE            BIT(11)
-#define DXENDLY(value)         (((value) & 0x3) << 12) /* Bits 12:13 */
-#define PPCONNECT              BIT(14)
-#define EXTCLKGATE             BIT(15)
-
-/********************** McBSP RCCR bit definitions *************************/
-#define RDISABLE               BIT(0)
-#define RDMAEN                 BIT(3)
-#define RFULL_CYCLE            BIT(11)
-
-/********************** McBSP SYSCONFIG bit definitions ********************/
-#define SOFTRST                        BIT(1)
-#define ENAWAKEUP              BIT(2)
-#define SIDLEMODE(value)       (((value) & 0x3) << 3)
-#define CLOCKACTIVITY(value)   (((value) & 0x3) << 8)
-
-/********************** McBSP SSELCR bit definitions ***********************/
-#define SIDETONEEN             BIT(10)
-
-/********************** McBSP Sidetone SYSCONFIG bit definitions ***********/
-#define ST_AUTOIDLE            BIT(0)
-
-/********************** McBSP Sidetone SGAINCR bit definitions *************/
-#define ST_CH0GAIN(value)      ((value) & 0xffff)      /* Bits 0:15 */
-#define ST_CH1GAIN(value)      (((value) & 0xffff) << 16) /* Bits 16:31 */
-
-/********************** McBSP Sidetone SFIRCR bit definitions **************/
-#define ST_FIRCOEFF(value)     ((value) & 0xffff)      /* Bits 0:15 */
-
-/********************** McBSP Sidetone SSELCR bit definitions **************/
-#define ST_SIDETONEEN          BIT(0)
-#define ST_COEFFWREN           BIT(1)
-#define ST_COEFFWRDONE         BIT(2)
-
-/********************** McBSP DMA operating modes **************************/
-#define MCBSP_DMA_MODE_ELEMENT         0
-#define MCBSP_DMA_MODE_THRESHOLD       1
-
-/********************** McBSP WAKEUPEN/IRQST/IRQEN bit definitions *********/
-#define RSYNCERREN             BIT(0)
-#define RFSREN                 BIT(1)
-#define REOFEN                 BIT(2)
-#define RRDYEN                 BIT(3)
-#define RUNDFLEN               BIT(4)
-#define ROVFLEN                        BIT(5)
-#define XSYNCERREN             BIT(7)
-#define XFSXEN                 BIT(8)
-#define XEOFEN                 BIT(9)
-#define XRDYEN                 BIT(10)
-#define XUNDFLEN               BIT(11)
-#define XOVFLEN                        BIT(12)
-#define XEMPTYEOFEN            BIT(14)
-
-/* Clock signal muxing options */
-#define CLKR_SRC_CLKR          0 /* CLKR signal is from the CLKR pin */
-#define CLKR_SRC_CLKX          1 /* CLKR signal is from the CLKX pin */
-#define FSR_SRC_FSR            2 /* FSR signal is from the FSR pin */
-#define FSR_SRC_FSX            3 /* FSR signal is from the FSX pin */
-
-/* McBSP functional clock sources */
-#define MCBSP_CLKS_PRCM_SRC    0
-#define MCBSP_CLKS_PAD_SRC     1
-
-/* we don't do multichannel for now */
-struct omap_mcbsp_reg_cfg {
-       u16 spcr2;
-       u16 spcr1;
-       u16 rcr2;
-       u16 rcr1;
-       u16 xcr2;
-       u16 xcr1;
-       u16 srgr2;
-       u16 srgr1;
-       u16 mcr2;
-       u16 mcr1;
-       u16 pcr0;
-       u16 rcerc;
-       u16 rcerd;
-       u16 xcerc;
-       u16 xcerd;
-       u16 rcere;
-       u16 rcerf;
-       u16 xcere;
-       u16 xcerf;
-       u16 rcerg;
-       u16 rcerh;
-       u16 xcerg;
-       u16 xcerh;
-       u16 xccr;
-       u16 rccr;
-};
-
-struct omap_mcbsp_st_data {
-       void __iomem *io_base_st;
-       struct clk *mcbsp_iclk;
-       bool running;
-       bool enabled;
-       s16 taps[128];  /* Sidetone filter coefficients */
-       int nr_taps;    /* Number of filter coefficients in use */
-       s16 ch0gain;
-       s16 ch1gain;
-};
-
-struct omap_mcbsp {
-       struct device *dev;
-       struct clk *fclk;
-       spinlock_t lock;
-       unsigned long phys_base;
-       unsigned long phys_dma_base;
-       void __iomem *io_base;
-       u8 id;
-       /*
-        * Flags indicating is the bus already activated and configured by
-        * another substream
-        */
-       int active;
-       int configured;
-       u8 free;
-
-       int irq;
-       int rx_irq;
-       int tx_irq;
-
-       /* Protect the field .free, while checking if the mcbsp is in use */
-       struct omap_mcbsp_platform_data *pdata;
-       struct omap_mcbsp_st_data *st_data;
-       struct omap_mcbsp_reg_cfg cfg_regs;
-       struct snd_dmaengine_dai_dma_data dma_data[2];
-       unsigned int dma_req[2];
-       int dma_op_mode;
-       u16 max_tx_thres;
-       u16 max_rx_thres;
-       void *reg_cache;
-       int reg_cache_size;
-
-       unsigned int fmt;
-       unsigned int in_freq;
-       unsigned int latency[2];
-       int clk_div;
-       int wlen;
-
-       struct pm_qos_request pm_qos_req;
-};
-
-void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
-                      const struct omap_mcbsp_reg_cfg *config);
-void omap_mcbsp_set_tx_threshold(struct omap_mcbsp *mcbsp, u16 threshold);
-void omap_mcbsp_set_rx_threshold(struct omap_mcbsp *mcbsp, u16 threshold);
-u16 omap_mcbsp_get_tx_delay(struct omap_mcbsp *mcbsp);
-u16 omap_mcbsp_get_rx_delay(struct omap_mcbsp *mcbsp);
-int omap_mcbsp_get_dma_op_mode(struct omap_mcbsp *mcbsp);
-int omap_mcbsp_request(struct omap_mcbsp *mcbsp);
-void omap_mcbsp_free(struct omap_mcbsp *mcbsp);
-void omap_mcbsp_start(struct omap_mcbsp *mcbsp, int stream);
-void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int stream);
-
-/* McBSP functional clock source changing function */
-int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id);
-
-/* Sidetone specific API */
-int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain);
-int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain);
-int omap_st_enable(struct omap_mcbsp *mcbsp);
-int omap_st_disable(struct omap_mcbsp *mcbsp);
-int omap_st_is_enabled(struct omap_mcbsp *mcbsp);
-
-int omap_mcbsp_init(struct platform_device *pdev);
-void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp);
-
-#endif /* __ASOC_MCBSP_H */
diff --git a/sound/soc/omap/omap-mcbsp-priv.h b/sound/soc/omap/omap-mcbsp-priv.h
new file mode 100644 (file)
index 0000000..7865cda
--- /dev/null
@@ -0,0 +1,324 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * OMAP Multi-Channel Buffered Serial Port
+ *
+ * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
+ *          Peter Ujfalusi <peter.ujfalusi@ti.com>
+ */
+
+#ifndef __OMAP_MCBSP_PRIV_H__
+#define __OMAP_MCBSP_PRIV_H__
+
+#include <linux/platform_data/asoc-ti-mcbsp.h>
+
+#ifdef CONFIG_ARCH_OMAP1
+#define mcbsp_omap1()  1
+#else
+#define mcbsp_omap1()  0
+#endif
+
+/* McBSP register numbers. Register address offset = num * reg_step */
+enum {
+       /* Common registers */
+       OMAP_MCBSP_REG_SPCR2 = 4,
+       OMAP_MCBSP_REG_SPCR1,
+       OMAP_MCBSP_REG_RCR2,
+       OMAP_MCBSP_REG_RCR1,
+       OMAP_MCBSP_REG_XCR2,
+       OMAP_MCBSP_REG_XCR1,
+       OMAP_MCBSP_REG_SRGR2,
+       OMAP_MCBSP_REG_SRGR1,
+       OMAP_MCBSP_REG_MCR2,
+       OMAP_MCBSP_REG_MCR1,
+       OMAP_MCBSP_REG_RCERA,
+       OMAP_MCBSP_REG_RCERB,
+       OMAP_MCBSP_REG_XCERA,
+       OMAP_MCBSP_REG_XCERB,
+       OMAP_MCBSP_REG_PCR0,
+       OMAP_MCBSP_REG_RCERC,
+       OMAP_MCBSP_REG_RCERD,
+       OMAP_MCBSP_REG_XCERC,
+       OMAP_MCBSP_REG_XCERD,
+       OMAP_MCBSP_REG_RCERE,
+       OMAP_MCBSP_REG_RCERF,
+       OMAP_MCBSP_REG_XCERE,
+       OMAP_MCBSP_REG_XCERF,
+       OMAP_MCBSP_REG_RCERG,
+       OMAP_MCBSP_REG_RCERH,
+       OMAP_MCBSP_REG_XCERG,
+       OMAP_MCBSP_REG_XCERH,
+
+       /* OMAP1-OMAP2420 registers */
+       OMAP_MCBSP_REG_DRR2 = 0,
+       OMAP_MCBSP_REG_DRR1,
+       OMAP_MCBSP_REG_DXR2,
+       OMAP_MCBSP_REG_DXR1,
+
+       /* OMAP2430 and onwards */
+       OMAP_MCBSP_REG_DRR = 0,
+       OMAP_MCBSP_REG_DXR = 2,
+       OMAP_MCBSP_REG_SYSCON = 35,
+       OMAP_MCBSP_REG_THRSH2,
+       OMAP_MCBSP_REG_THRSH1,
+       OMAP_MCBSP_REG_IRQST = 40,
+       OMAP_MCBSP_REG_IRQEN,
+       OMAP_MCBSP_REG_WAKEUPEN,
+       OMAP_MCBSP_REG_XCCR,
+       OMAP_MCBSP_REG_RCCR,
+       OMAP_MCBSP_REG_XBUFFSTAT,
+       OMAP_MCBSP_REG_RBUFFSTAT,
+       OMAP_MCBSP_REG_SSELCR,
+};
+
+/************************** McBSP SPCR1 bit definitions ***********************/
+#define RRST                   BIT(0)
+#define RRDY                   BIT(1)
+#define RFULL                  BIT(2)
+#define RSYNC_ERR              BIT(3)
+#define RINTM(value)           (((value) & 0x3) << 4)  /* bits 4:5 */
+#define ABIS                   BIT(6)
+#define DXENA                  BIT(7)
+#define CLKSTP(value)          (((value) & 0x3) << 11) /* bits 11:12 */
+#define RJUST(value)           (((value) & 0x3) << 13) /* bits 13:14 */
+#define ALB                    BIT(15)
+#define DLB                    BIT(15)
+
+/************************** McBSP SPCR2 bit definitions ***********************/
+#define XRST                   BIT(0)
+#define XRDY                   BIT(1)
+#define XEMPTY                 BIT(2)
+#define XSYNC_ERR              BIT(3)
+#define XINTM(value)           (((value) & 0x3) << 4)  /* bits 4:5 */
+#define GRST                   BIT(6)
+#define FRST                   BIT(7)
+#define SOFT                   BIT(8)
+#define FREE                   BIT(9)
+
+/************************** McBSP PCR bit definitions *************************/
+#define CLKRP                  BIT(0)
+#define CLKXP                  BIT(1)
+#define FSRP                   BIT(2)
+#define FSXP                   BIT(3)
+#define DR_STAT                        BIT(4)
+#define DX_STAT                        BIT(5)
+#define CLKS_STAT              BIT(6)
+#define SCLKME                 BIT(7)
+#define CLKRM                  BIT(8)
+#define CLKXM                  BIT(9)
+#define FSRM                   BIT(10)
+#define FSXM                   BIT(11)
+#define RIOEN                  BIT(12)
+#define XIOEN                  BIT(13)
+#define IDLE_EN                        BIT(14)
+
+/************************** McBSP RCR1 bit definitions ************************/
+#define RWDLEN1(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
+#define RFRLEN1(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
+
+/************************** McBSP XCR1 bit definitions ************************/
+#define XWDLEN1(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
+#define XFRLEN1(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
+
+/*************************** McBSP RCR2 bit definitions ***********************/
+#define RDATDLY(value)         ((value) & 0x3)         /* Bits 0:1 */
+#define RFIG                   BIT(2)
+#define RCOMPAND(value)                (((value) & 0x3) << 3)  /* Bits 3:4 */
+#define RWDLEN2(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
+#define RFRLEN2(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
+#define RPHASE                 BIT(15)
+
+/*************************** McBSP XCR2 bit definitions ***********************/
+#define XDATDLY(value)         ((value) & 0x3)         /* Bits 0:1 */
+#define XFIG                   BIT(2)
+#define XCOMPAND(value)                (((value) & 0x3) << 3)  /* Bits 3:4 */
+#define XWDLEN2(value)         (((value) & 0x7) << 5)  /* Bits 5:7 */
+#define XFRLEN2(value)         (((value) & 0x7f) << 8) /* Bits 8:14 */
+#define XPHASE                 BIT(15)
+
+/************************* McBSP SRGR1 bit definitions ************************/
+#define CLKGDV(value)          ((value) & 0x7f)                /* Bits 0:7 */
+#define FWID(value)            (((value) & 0xff) << 8) /* Bits 8:15 */
+
+/************************* McBSP SRGR2 bit definitions ************************/
+#define FPER(value)            ((value) & 0x0fff)      /* Bits 0:11 */
+#define FSGM                   BIT(12)
+#define CLKSM                  BIT(13)
+#define CLKSP                  BIT(14)
+#define GSYNC                  BIT(15)
+
+/************************* McBSP MCR1 bit definitions *************************/
+#define RMCM                   BIT(0)
+#define RCBLK(value)           (((value) & 0x7) << 2)  /* Bits 2:4 */
+#define RPABLK(value)          (((value) & 0x3) << 5)  /* Bits 5:6 */
+#define RPBBLK(value)          (((value) & 0x3) << 7)  /* Bits 7:8 */
+
+/************************* McBSP MCR2 bit definitions *************************/
+#define XMCM(value)            ((value) & 0x3)         /* Bits 0:1 */
+#define XCBLK(value)           (((value) & 0x7) << 2)  /* Bits 2:4 */
+#define XPABLK(value)          (((value) & 0x3) << 5)  /* Bits 5:6 */
+#define XPBBLK(value)          (((value) & 0x3) << 7)  /* Bits 7:8 */
+
+/*********************** McBSP XCCR bit definitions *************************/
+#define XDISABLE               BIT(0)
+#define XDMAEN                 BIT(3)
+#define DILB                   BIT(5)
+#define XFULL_CYCLE            BIT(11)
+#define DXENDLY(value)         (((value) & 0x3) << 12) /* Bits 12:13 */
+#define PPCONNECT              BIT(14)
+#define EXTCLKGATE             BIT(15)
+
+/********************** McBSP RCCR bit definitions *************************/
+#define RDISABLE               BIT(0)
+#define RDMAEN                 BIT(3)
+#define RFULL_CYCLE            BIT(11)
+
+/********************** McBSP SYSCONFIG bit definitions ********************/
+#define SOFTRST                        BIT(1)
+#define ENAWAKEUP              BIT(2)
+#define SIDLEMODE(value)       (((value) & 0x3) << 3)
+#define CLOCKACTIVITY(value)   (((value) & 0x3) << 8)
+
+/********************** McBSP DMA operating modes **************************/
+#define MCBSP_DMA_MODE_ELEMENT         0
+#define MCBSP_DMA_MODE_THRESHOLD       1
+
+/********************** McBSP WAKEUPEN/IRQST/IRQEN bit definitions *********/
+#define RSYNCERREN             BIT(0)
+#define RFSREN                 BIT(1)
+#define REOFEN                 BIT(2)
+#define RRDYEN                 BIT(3)
+#define RUNDFLEN               BIT(4)
+#define ROVFLEN                        BIT(5)
+#define XSYNCERREN             BIT(7)
+#define XFSXEN                 BIT(8)
+#define XEOFEN                 BIT(9)
+#define XRDYEN                 BIT(10)
+#define XUNDFLEN               BIT(11)
+#define XOVFLEN                        BIT(12)
+#define XEMPTYEOFEN            BIT(14)
+
+/* Clock signal muxing options */
+#define CLKR_SRC_CLKR          0 /* CLKR signal is from the CLKR pin */
+#define CLKR_SRC_CLKX          1 /* CLKR signal is from the CLKX pin */
+#define FSR_SRC_FSR            2 /* FSR signal is from the FSR pin */
+#define FSR_SRC_FSX            3 /* FSR signal is from the FSX pin */
+
+/* McBSP functional clock sources */
+#define MCBSP_CLKS_PRCM_SRC    0
+#define MCBSP_CLKS_PAD_SRC     1
+
+/* we don't do multichannel for now */
+struct omap_mcbsp_reg_cfg {
+       u16 spcr2;
+       u16 spcr1;
+       u16 rcr2;
+       u16 rcr1;
+       u16 xcr2;
+       u16 xcr1;
+       u16 srgr2;
+       u16 srgr1;
+       u16 mcr2;
+       u16 mcr1;
+       u16 pcr0;
+       u16 rcerc;
+       u16 rcerd;
+       u16 xcerc;
+       u16 xcerd;
+       u16 rcere;
+       u16 rcerf;
+       u16 xcere;
+       u16 xcerf;
+       u16 rcerg;
+       u16 rcerh;
+       u16 xcerg;
+       u16 xcerh;
+       u16 xccr;
+       u16 rccr;
+};
+
+struct omap_mcbsp_st_data;
+
+struct omap_mcbsp {
+       struct device *dev;
+       struct clk *fclk;
+       spinlock_t lock;
+       unsigned long phys_base;
+       unsigned long phys_dma_base;
+       void __iomem *io_base;
+       u8 id;
+       /*
+        * Flags indicating is the bus already activated and configured by
+        * another substream
+        */
+       int active;
+       int configured;
+       u8 free;
+
+       int irq;
+       int rx_irq;
+       int tx_irq;
+
+       /* Protect the field .free, while checking if the mcbsp is in use */
+       struct omap_mcbsp_platform_data *pdata;
+       struct omap_mcbsp_st_data *st_data;
+       struct omap_mcbsp_reg_cfg cfg_regs;
+       struct snd_dmaengine_dai_dma_data dma_data[2];
+       unsigned int dma_req[2];
+       int dma_op_mode;
+       u16 max_tx_thres;
+       u16 max_rx_thres;
+       void *reg_cache;
+       int reg_cache_size;
+
+       unsigned int fmt;
+       unsigned int in_freq;
+       unsigned int latency[2];
+       int clk_div;
+       int wlen;
+
+       struct pm_qos_request pm_qos_req;
+};
+
+static inline void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)
+{
+       void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step;
+
+       if (mcbsp->pdata->reg_size == 2) {
+               ((u16 *)mcbsp->reg_cache)[reg] = (u16)val;
+               writew_relaxed((u16)val, addr);
+       } else {
+               ((u32 *)mcbsp->reg_cache)[reg] = val;
+               writel_relaxed(val, addr);
+       }
+}
+
+static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg,
+                                 bool from_cache)
+{
+       void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step;
+
+       if (mcbsp->pdata->reg_size == 2) {
+               return !from_cache ? readw_relaxed(addr) :
+                                    ((u16 *)mcbsp->reg_cache)[reg];
+       } else {
+               return !from_cache ? readl_relaxed(addr) :
+                                    ((u32 *)mcbsp->reg_cache)[reg];
+       }
+}
+
+#define MCBSP_READ(mcbsp, reg) \
+               omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 0)
+#define MCBSP_WRITE(mcbsp, reg, val) \
+               omap_mcbsp_write(mcbsp, OMAP_MCBSP_REG_##reg, val)
+#define MCBSP_READ_CACHE(mcbsp, reg) \
+               omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 1)
+
+
+/* Sidetone specific API */
+int omap_mcbsp_st_init(struct platform_device *pdev);
+void omap_mcbsp_st_cleanup(struct platform_device *pdev);
+
+int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp);
+int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp);
+
+#endif /* __OMAP_MCBSP_PRIV_H__ */
diff --git a/sound/soc/omap/omap-mcbsp-st.c b/sound/soc/omap/omap-mcbsp-st.c
new file mode 100644 (file)
index 0000000..1a3fe85
--- /dev/null
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * McBSP Sidetone support
+ *
+ * Copyright (C) 2004 Nokia Corporation
+ * Author: Samuel Ortiz <samuel.ortiz@nokia.com>
+ *
+ * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
+ *          Peter Ujfalusi <peter.ujfalusi@ti.com>
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/pm_runtime.h>
+
+#include "omap-mcbsp.h"
+#include "omap-mcbsp-priv.h"
+
+/* OMAP3 sidetone control registers */
+#define OMAP_ST_REG_REV                0x00
+#define OMAP_ST_REG_SYSCONFIG  0x10
+#define OMAP_ST_REG_IRQSTATUS  0x18
+#define OMAP_ST_REG_IRQENABLE  0x1C
+#define OMAP_ST_REG_SGAINCR    0x24
+#define OMAP_ST_REG_SFIRCR     0x28
+#define OMAP_ST_REG_SSELCR     0x2C
+
+/********************** McBSP SSELCR bit definitions ***********************/
+#define SIDETONEEN             BIT(10)
+
+/********************** McBSP Sidetone SYSCONFIG bit definitions ***********/
+#define ST_AUTOIDLE            BIT(0)
+
+/********************** McBSP Sidetone SGAINCR bit definitions *************/
+#define ST_CH0GAIN(value)      ((value) & 0xffff)      /* Bits 0:15 */
+#define ST_CH1GAIN(value)      (((value) & 0xffff) << 16) /* Bits 16:31 */
+
+/********************** McBSP Sidetone SFIRCR bit definitions **************/
+#define ST_FIRCOEFF(value)     ((value) & 0xffff)      /* Bits 0:15 */
+
+/********************** McBSP Sidetone SSELCR bit definitions **************/
+#define ST_SIDETONEEN          BIT(0)
+#define ST_COEFFWREN           BIT(1)
+#define ST_COEFFWRDONE         BIT(2)
+
+struct omap_mcbsp_st_data {
+       void __iomem *io_base_st;
+       struct clk *mcbsp_iclk;
+       bool running;
+       bool enabled;
+       s16 taps[128];  /* Sidetone filter coefficients */
+       int nr_taps;    /* Number of filter coefficients in use */
+       s16 ch0gain;
+       s16 ch1gain;
+};
+
+static void omap_mcbsp_st_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)
+{
+       writel_relaxed(val, mcbsp->st_data->io_base_st + reg);
+}
+
+static int omap_mcbsp_st_read(struct omap_mcbsp *mcbsp, u16 reg)
+{
+       return readl_relaxed(mcbsp->st_data->io_base_st + reg);
+}
+
+#define MCBSP_ST_READ(mcbsp, reg) omap_mcbsp_st_read(mcbsp, OMAP_ST_REG_##reg)
+#define MCBSP_ST_WRITE(mcbsp, reg, val) \
+                       omap_mcbsp_st_write(mcbsp, OMAP_ST_REG_##reg, val)
+
+static void omap_mcbsp_st_on(struct omap_mcbsp *mcbsp)
+{
+       unsigned int w;
+
+       if (mcbsp->pdata->force_ick_on)
+               mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, true);
+
+       /* Disable Sidetone clock auto-gating for normal operation */
+       w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
+       MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w & ~(ST_AUTOIDLE));
+
+       /* Enable McBSP Sidetone */
+       w = MCBSP_READ(mcbsp, SSELCR);
+       MCBSP_WRITE(mcbsp, SSELCR, w | SIDETONEEN);
+
+       /* Enable Sidetone from Sidetone Core */
+       w = MCBSP_ST_READ(mcbsp, SSELCR);
+       MCBSP_ST_WRITE(mcbsp, SSELCR, w | ST_SIDETONEEN);
+}
+
+static void omap_mcbsp_st_off(struct omap_mcbsp *mcbsp)
+{
+       unsigned int w;
+
+       w = MCBSP_ST_READ(mcbsp, SSELCR);
+       MCBSP_ST_WRITE(mcbsp, SSELCR, w & ~(ST_SIDETONEEN));
+
+       w = MCBSP_READ(mcbsp, SSELCR);
+       MCBSP_WRITE(mcbsp, SSELCR, w & ~(SIDETONEEN));
+
+       /* Enable Sidetone clock auto-gating to reduce power consumption */
+       w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
+       MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w | ST_AUTOIDLE);
+
+       if (mcbsp->pdata->force_ick_on)
+               mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, false);
+}
+
+static void omap_mcbsp_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir)
+{
+       u16 val, i;
+
+       val = MCBSP_ST_READ(mcbsp, SSELCR);
+
+       if (val & ST_COEFFWREN)
+               MCBSP_ST_WRITE(mcbsp, SSELCR, val & ~(ST_COEFFWREN));
+
+       MCBSP_ST_WRITE(mcbsp, SSELCR, val | ST_COEFFWREN);
+
+       for (i = 0; i < 128; i++)
+               MCBSP_ST_WRITE(mcbsp, SFIRCR, fir[i]);
+
+       i = 0;
+
+       val = MCBSP_ST_READ(mcbsp, SSELCR);
+       while (!(val & ST_COEFFWRDONE) && (++i < 1000))
+               val = MCBSP_ST_READ(mcbsp, SSELCR);
+
+       MCBSP_ST_WRITE(mcbsp, SSELCR, val & ~(ST_COEFFWREN));
+
+       if (i == 1000)
+               dev_err(mcbsp->dev, "McBSP FIR load error!\n");
+}
+
+static void omap_mcbsp_st_chgain(struct omap_mcbsp *mcbsp)
+{
+       u16 w;
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+
+       w = MCBSP_ST_READ(mcbsp, SSELCR);
+
+       MCBSP_ST_WRITE(mcbsp, SGAINCR, ST_CH0GAIN(st_data->ch0gain) |
+                      ST_CH1GAIN(st_data->ch1gain));
+}
+
+static int omap_mcbsp_st_set_chgain(struct omap_mcbsp *mcbsp, int channel,
+                                   s16 chgain)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+       int ret = 0;
+
+       if (!st_data)
+               return -ENOENT;
+
+       spin_lock_irq(&mcbsp->lock);
+       if (channel == 0)
+               st_data->ch0gain = chgain;
+       else if (channel == 1)
+               st_data->ch1gain = chgain;
+       else
+               ret = -EINVAL;
+
+       if (st_data->enabled)
+               omap_mcbsp_st_chgain(mcbsp);
+       spin_unlock_irq(&mcbsp->lock);
+
+       return ret;
+}
+
+static int omap_mcbsp_st_get_chgain(struct omap_mcbsp *mcbsp, int channel,
+                                   s16 *chgain)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+       int ret = 0;
+
+       if (!st_data)
+               return -ENOENT;
+
+       spin_lock_irq(&mcbsp->lock);
+       if (channel == 0)
+               *chgain = st_data->ch0gain;
+       else if (channel == 1)
+               *chgain = st_data->ch1gain;
+       else
+               ret = -EINVAL;
+       spin_unlock_irq(&mcbsp->lock);
+
+       return ret;
+}
+
+static int omap_mcbsp_st_enable(struct omap_mcbsp *mcbsp)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+
+       if (!st_data)
+               return -ENODEV;
+
+       spin_lock_irq(&mcbsp->lock);
+       st_data->enabled = 1;
+       omap_mcbsp_st_start(mcbsp);
+       spin_unlock_irq(&mcbsp->lock);
+
+       return 0;
+}
+
+static int omap_mcbsp_st_disable(struct omap_mcbsp *mcbsp)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+       int ret = 0;
+
+       if (!st_data)
+               return -ENODEV;
+
+       spin_lock_irq(&mcbsp->lock);
+       omap_mcbsp_st_stop(mcbsp);
+       st_data->enabled = 0;
+       spin_unlock_irq(&mcbsp->lock);
+
+       return ret;
+}
+
+static int omap_mcbsp_st_is_enabled(struct omap_mcbsp *mcbsp)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+
+       if (!st_data)
+               return -ENODEV;
+
+       return st_data->enabled;
+}
+
+static ssize_t st_taps_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+       ssize_t status = 0;
+       int i;
+
+       spin_lock_irq(&mcbsp->lock);
+       for (i = 0; i < st_data->nr_taps; i++)
+               status += sprintf(&buf[status], (i ? ", %d" : "%d"),
+                                 st_data->taps[i]);
+       if (i)
+               status += sprintf(&buf[status], "\n");
+       spin_unlock_irq(&mcbsp->lock);
+
+       return status;
+}
+
+static ssize_t st_taps_store(struct device *dev,
+                            struct device_attribute *attr,
+                            const char *buf, size_t size)
+{
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+       int val, tmp, status, i = 0;
+
+       spin_lock_irq(&mcbsp->lock);
+       memset(st_data->taps, 0, sizeof(st_data->taps));
+       st_data->nr_taps = 0;
+
+       do {
+               status = sscanf(buf, "%d%n", &val, &tmp);
+               if (status < 0 || status == 0) {
+                       size = -EINVAL;
+                       goto out;
+               }
+               if (val < -32768 || val > 32767) {
+                       size = -EINVAL;
+                       goto out;
+               }
+               st_data->taps[i++] = val;
+               buf += tmp;
+               if (*buf != ',')
+                       break;
+               buf++;
+       } while (1);
+
+       st_data->nr_taps = i;
+
+out:
+       spin_unlock_irq(&mcbsp->lock);
+
+       return size;
+}
+
+static DEVICE_ATTR_RW(st_taps);
+
+static const struct attribute *sidetone_attrs[] = {
+       &dev_attr_st_taps.attr,
+       NULL,
+};
+
+static const struct attribute_group sidetone_attr_group = {
+       .attrs = (struct attribute **)sidetone_attrs,
+};
+
+int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+
+       if (st_data->enabled && !st_data->running) {
+               omap_mcbsp_st_fir_write(mcbsp, st_data->taps);
+               omap_mcbsp_st_chgain(mcbsp);
+
+               if (!mcbsp->free) {
+                       omap_mcbsp_st_on(mcbsp);
+                       st_data->running = 1;
+               }
+       }
+
+       return 0;
+}
+
+int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp)
+{
+       struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
+
+       if (st_data->running) {
+               if (!mcbsp->free) {
+                       omap_mcbsp_st_off(mcbsp);
+                       st_data->running = 0;
+               }
+       }
+
+       return 0;
+}
+
+int omap_mcbsp_st_init(struct platform_device *pdev)
+{
+       struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
+       struct omap_mcbsp_st_data *st_data;
+       struct resource *res;
+       int ret;
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sidetone");
+       if (!res)
+               return 0;
+
+       st_data = devm_kzalloc(mcbsp->dev, sizeof(*mcbsp->st_data), GFP_KERNEL);
+       if (!st_data)
+               return -ENOMEM;
+
+       st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick");
+       if (IS_ERR(st_data->mcbsp_iclk)) {
+               dev_warn(mcbsp->dev,
+                        "Failed to get ick, sidetone might be broken\n");
+               st_data->mcbsp_iclk = NULL;
+       }
+
+       st_data->io_base_st = devm_ioremap(mcbsp->dev, res->start,
+                                          resource_size(res));
+       if (!st_data->io_base_st)
+               return -ENOMEM;
+
+       ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group);
+       if (ret)
+               return ret;
+
+       mcbsp->st_data = st_data;
+
+       return 0;
+}
+
+void omap_mcbsp_st_cleanup(struct platform_device *pdev)
+{
+       struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
+
+       if (mcbsp->st_data) {
+               sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group);
+               clk_put(mcbsp->st_data->mcbsp_iclk);
+       }
+}
+
+static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
+{
+       struct soc_mixer_control *mc =
+               (struct soc_mixer_control *)kcontrol->private_value;
+       int max = mc->max;
+       int min = mc->min;
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = min;
+       uinfo->value.integer.max = max;
+       return 0;
+}
+
+#define OMAP_MCBSP_ST_CHANNEL_VOLUME(channel)                          \
+static int                                                             \
+omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc,                \
+                                      struct snd_ctl_elem_value *uc)   \
+{                                                                      \
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
+       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);    \
+       struct soc_mixer_control *mc =                                  \
+               (struct soc_mixer_control *)kc->private_value;          \
+       int max = mc->max;                                              \
+       int min = mc->min;                                              \
+       int val = uc->value.integer.value[0];                           \
+                                                                       \
+       if (val < min || val > max)                                     \
+               return -EINVAL;                                         \
+                                                                       \
+       /* OMAP McBSP implementation uses index values 0..4 */          \
+       return omap_mcbsp_st_set_chgain(mcbsp, channel, val);           \
+}                                                                      \
+                                                                       \
+static int                                                             \
+omap_mcbsp_get_st_ch##channel##_volume(struct snd_kcontrol *kc,                \
+                                      struct snd_ctl_elem_value *uc)   \
+{                                                                      \
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
+       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);    \
+       s16 chgain;                                                     \
+                                                                       \
+       if (omap_mcbsp_st_get_chgain(mcbsp, channel, &chgain))          \
+               return -EAGAIN;                                         \
+                                                                       \
+       uc->value.integer.value[0] = chgain;                            \
+       return 0;                                                       \
+}
+
+OMAP_MCBSP_ST_CHANNEL_VOLUME(0)
+OMAP_MCBSP_ST_CHANNEL_VOLUME(1)
+
+static int omap_mcbsp_st_put_mode(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
+       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
+       u8 value = ucontrol->value.integer.value[0];
+
+       if (value == omap_mcbsp_st_is_enabled(mcbsp))
+               return 0;
+
+       if (value)
+               omap_mcbsp_st_enable(mcbsp);
+       else
+               omap_mcbsp_st_disable(mcbsp);
+
+       return 1;
+}
+
+static int omap_mcbsp_st_get_mode(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
+       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
+
+       ucontrol->value.integer.value[0] = omap_mcbsp_st_is_enabled(mcbsp);
+       return 0;
+}
+
+#define OMAP_MCBSP_SOC_SINGLE_S16_EXT(xname, xmin, xmax,               \
+                                     xhandler_get, xhandler_put)       \
+{      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,             \
+       .info = omap_mcbsp_st_info_volsw,                               \
+       .get = xhandler_get, .put = xhandler_put,                       \
+       .private_value = (unsigned long)&(struct soc_mixer_control)     \
+       {.min = xmin, .max = xmax} }
+
+#define OMAP_MCBSP_ST_CONTROLS(port)                                     \
+static const struct snd_kcontrol_new omap_mcbsp##port##_st_controls[] = { \
+SOC_SINGLE_EXT("McBSP" #port " Sidetone Switch", 1, 0, 1, 0,             \
+              omap_mcbsp_st_get_mode, omap_mcbsp_st_put_mode),           \
+OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 0 Volume", \
+                             -32768, 32767,                              \
+                             omap_mcbsp_get_st_ch0_volume,               \
+                             omap_mcbsp_set_st_ch0_volume),              \
+OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 1 Volume", \
+                             -32768, 32767,                              \
+                             omap_mcbsp_get_st_ch1_volume,               \
+                             omap_mcbsp_set_st_ch1_volume),              \
+}
+
+OMAP_MCBSP_ST_CONTROLS(2);
+OMAP_MCBSP_ST_CONTROLS(3);
+
+int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id)
+{
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
+
+       if (!mcbsp->st_data) {
+               dev_warn(mcbsp->dev, "No sidetone data for port\n");
+               return 0;
+       }
+
+       switch (port_id) {
+       case 2: /* McBSP 2 */
+               return snd_soc_add_dai_controls(cpu_dai,
+                                       omap_mcbsp2_st_controls,
+                                       ARRAY_SIZE(omap_mcbsp2_st_controls));
+       case 3: /* McBSP 3 */
+               return snd_soc_add_dai_controls(cpu_dai,
+                                       omap_mcbsp3_st_controls,
+                                       ARRAY_SIZE(omap_mcbsp3_st_controls));
+       default:
+               dev_err(mcbsp->dev, "Port %d not supported\n", port_id);
+               break;
+       }
+
+       return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(omap_mcbsp_st_add_controls);
index 69a6b8a..e48fad1 100644 (file)
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include "mcbsp.h"
+#include "omap-mcbsp-priv.h"
 #include "omap-mcbsp.h"
 #include "sdma-pcm.h"
 
 #define OMAP_MCBSP_RATES       (SNDRV_PCM_RATE_8000_96000)
 
-#define OMAP_MCBSP_SOC_SINGLE_S16_EXT(xname, xmin, xmax, \
-       xhandler_get, xhandler_put) \
-{      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
-       .info = omap_mcbsp_st_info_volsw, \
-       .get = xhandler_get, .put = xhandler_put, \
-       .private_value = (unsigned long) &(struct soc_mixer_control) \
-       {.min = xmin, .max = xmax} }
-
 enum {
        OMAP_MCBSP_WORD_8 = 0,
        OMAP_MCBSP_WORD_12,
@@ -59,6 +50,702 @@ enum {
        OMAP_MCBSP_WORD_32,
 };
 
+static void omap_mcbsp_dump_reg(struct omap_mcbsp *mcbsp)
+{
+       dev_dbg(mcbsp->dev, "**** McBSP%d regs ****\n", mcbsp->id);
+       dev_dbg(mcbsp->dev, "DRR2:  0x%04x\n", MCBSP_READ(mcbsp, DRR2));
+       dev_dbg(mcbsp->dev, "DRR1:  0x%04x\n", MCBSP_READ(mcbsp, DRR1));
+       dev_dbg(mcbsp->dev, "DXR2:  0x%04x\n", MCBSP_READ(mcbsp, DXR2));
+       dev_dbg(mcbsp->dev, "DXR1:  0x%04x\n", MCBSP_READ(mcbsp, DXR1));
+       dev_dbg(mcbsp->dev, "SPCR2: 0x%04x\n", MCBSP_READ(mcbsp, SPCR2));
+       dev_dbg(mcbsp->dev, "SPCR1: 0x%04x\n", MCBSP_READ(mcbsp, SPCR1));
+       dev_dbg(mcbsp->dev, "RCR2:  0x%04x\n", MCBSP_READ(mcbsp, RCR2));
+       dev_dbg(mcbsp->dev, "RCR1:  0x%04x\n", MCBSP_READ(mcbsp, RCR1));
+       dev_dbg(mcbsp->dev, "XCR2:  0x%04x\n", MCBSP_READ(mcbsp, XCR2));
+       dev_dbg(mcbsp->dev, "XCR1:  0x%04x\n", MCBSP_READ(mcbsp, XCR1));
+       dev_dbg(mcbsp->dev, "SRGR2: 0x%04x\n", MCBSP_READ(mcbsp, SRGR2));
+       dev_dbg(mcbsp->dev, "SRGR1: 0x%04x\n", MCBSP_READ(mcbsp, SRGR1));
+       dev_dbg(mcbsp->dev, "PCR0:  0x%04x\n", MCBSP_READ(mcbsp, PCR0));
+       dev_dbg(mcbsp->dev, "***********************\n");
+}
+
+static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
+{
+       struct clk *fck_src;
+       const char *src;
+       int r;
+
+       if (fck_src_id == MCBSP_CLKS_PAD_SRC)
+               src = "pad_fck";
+       else if (fck_src_id == MCBSP_CLKS_PRCM_SRC)
+               src = "prcm_fck";
+       else
+               return -EINVAL;
+
+       fck_src = clk_get(mcbsp->dev, src);
+       if (IS_ERR(fck_src)) {
+               dev_err(mcbsp->dev, "CLKS: could not clk_get() %s\n", src);
+               return -EINVAL;
+       }
+
+       pm_runtime_put_sync(mcbsp->dev);
+
+       r = clk_set_parent(mcbsp->fclk, fck_src);
+       if (r) {
+               dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n",
+                       src);
+               clk_put(fck_src);
+               return r;
+       }
+
+       pm_runtime_get_sync(mcbsp->dev);
+
+       clk_put(fck_src);
+
+       return 0;
+}
+
+static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data)
+{
+       struct omap_mcbsp *mcbsp = data;
+       u16 irqst;
+
+       irqst = MCBSP_READ(mcbsp, IRQST);
+       dev_dbg(mcbsp->dev, "IRQ callback : 0x%x\n", irqst);
+
+       if (irqst & RSYNCERREN)
+               dev_err(mcbsp->dev, "RX Frame Sync Error!\n");
+       if (irqst & RFSREN)
+               dev_dbg(mcbsp->dev, "RX Frame Sync\n");
+       if (irqst & REOFEN)
+               dev_dbg(mcbsp->dev, "RX End Of Frame\n");
+       if (irqst & RRDYEN)
+               dev_dbg(mcbsp->dev, "RX Buffer Threshold Reached\n");
+       if (irqst & RUNDFLEN)
+               dev_err(mcbsp->dev, "RX Buffer Underflow!\n");
+       if (irqst & ROVFLEN)
+               dev_err(mcbsp->dev, "RX Buffer Overflow!\n");
+
+       if (irqst & XSYNCERREN)
+               dev_err(mcbsp->dev, "TX Frame Sync Error!\n");
+       if (irqst & XFSXEN)
+               dev_dbg(mcbsp->dev, "TX Frame Sync\n");
+       if (irqst & XEOFEN)
+               dev_dbg(mcbsp->dev, "TX End Of Frame\n");
+       if (irqst & XRDYEN)
+               dev_dbg(mcbsp->dev, "TX Buffer threshold Reached\n");
+       if (irqst & XUNDFLEN)
+               dev_err(mcbsp->dev, "TX Buffer Underflow!\n");
+       if (irqst & XOVFLEN)
+               dev_err(mcbsp->dev, "TX Buffer Overflow!\n");
+       if (irqst & XEMPTYEOFEN)
+               dev_dbg(mcbsp->dev, "TX Buffer empty at end of frame\n");
+
+       MCBSP_WRITE(mcbsp, IRQST, irqst);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *data)
+{
+       struct omap_mcbsp *mcbsp = data;
+       u16 irqst_spcr2;
+
+       irqst_spcr2 = MCBSP_READ(mcbsp, SPCR2);
+       dev_dbg(mcbsp->dev, "TX IRQ callback : 0x%x\n", irqst_spcr2);
+
+       if (irqst_spcr2 & XSYNC_ERR) {
+               dev_err(mcbsp->dev, "TX Frame Sync Error! : 0x%x\n",
+                       irqst_spcr2);
+               /* Writing zero to XSYNC_ERR clears the IRQ */
+               MCBSP_WRITE(mcbsp, SPCR2, MCBSP_READ_CACHE(mcbsp, SPCR2));
+       }
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *data)
+{
+       struct omap_mcbsp *mcbsp = data;
+       u16 irqst_spcr1;
+
+       irqst_spcr1 = MCBSP_READ(mcbsp, SPCR1);
+       dev_dbg(mcbsp->dev, "RX IRQ callback : 0x%x\n", irqst_spcr1);
+
+       if (irqst_spcr1 & RSYNC_ERR) {
+               dev_err(mcbsp->dev, "RX Frame Sync Error! : 0x%x\n",
+                       irqst_spcr1);
+               /* Writing zero to RSYNC_ERR clears the IRQ */
+               MCBSP_WRITE(mcbsp, SPCR1, MCBSP_READ_CACHE(mcbsp, SPCR1));
+       }
+
+       return IRQ_HANDLED;
+}
+
+/*
+ * omap_mcbsp_config simply write a config to the
+ * appropriate McBSP.
+ * You either call this function or set the McBSP registers
+ * by yourself before calling omap_mcbsp_start().
+ */
+static void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
+                             const struct omap_mcbsp_reg_cfg *config)
+{
+       dev_dbg(mcbsp->dev, "Configuring McBSP%d  phys_base: 0x%08lx\n",
+               mcbsp->id, mcbsp->phys_base);
+
+       /* We write the given config */
+       MCBSP_WRITE(mcbsp, SPCR2, config->spcr2);
+       MCBSP_WRITE(mcbsp, SPCR1, config->spcr1);
+       MCBSP_WRITE(mcbsp, RCR2, config->rcr2);
+       MCBSP_WRITE(mcbsp, RCR1, config->rcr1);
+       MCBSP_WRITE(mcbsp, XCR2, config->xcr2);
+       MCBSP_WRITE(mcbsp, XCR1, config->xcr1);
+       MCBSP_WRITE(mcbsp, SRGR2, config->srgr2);
+       MCBSP_WRITE(mcbsp, SRGR1, config->srgr1);
+       MCBSP_WRITE(mcbsp, MCR2, config->mcr2);
+       MCBSP_WRITE(mcbsp, MCR1, config->mcr1);
+       MCBSP_WRITE(mcbsp, PCR0, config->pcr0);
+       if (mcbsp->pdata->has_ccr) {
+               MCBSP_WRITE(mcbsp, XCCR, config->xccr);
+               MCBSP_WRITE(mcbsp, RCCR, config->rccr);
+       }
+       /* Enable wakeup behavior */
+       if (mcbsp->pdata->has_wakeup)
+               MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
+
+       /* Enable TX/RX sync error interrupts by default */
+       if (mcbsp->irq)
+               MCBSP_WRITE(mcbsp, IRQEN, RSYNCERREN | XSYNCERREN |
+                           RUNDFLEN | ROVFLEN | XUNDFLEN | XOVFLEN);
+}
+
+/**
+ * omap_mcbsp_dma_reg_params - returns the address of mcbsp data register
+ * @mcbsp: omap_mcbsp struct for the McBSP instance
+ * @stream: Stream direction (playback/capture)
+ *
+ * Returns the address of mcbsp data transmit register or data receive register
+ * to be used by DMA for transferring/receiving data
+ */
+static int omap_mcbsp_dma_reg_params(struct omap_mcbsp *mcbsp,
+                                    unsigned int stream)
+{
+       int data_reg;
+
+       if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+               if (mcbsp->pdata->reg_size == 2)
+                       data_reg = OMAP_MCBSP_REG_DXR1;
+               else
+                       data_reg = OMAP_MCBSP_REG_DXR;
+       } else {
+               if (mcbsp->pdata->reg_size == 2)
+                       data_reg = OMAP_MCBSP_REG_DRR1;
+               else
+                       data_reg = OMAP_MCBSP_REG_DRR;
+       }
+
+       return mcbsp->phys_dma_base + data_reg * mcbsp->pdata->reg_step;
+}
+
+/*
+ * omap_mcbsp_set_rx_threshold configures the transmit threshold in words.
+ * The threshold parameter is 1 based, and it is converted (threshold - 1)
+ * for the THRSH2 register.
+ */
+static void omap_mcbsp_set_tx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
+{
+       if (threshold && threshold <= mcbsp->max_tx_thres)
+               MCBSP_WRITE(mcbsp, THRSH2, threshold - 1);
+}
+
+/*
+ * omap_mcbsp_set_rx_threshold configures the receive threshold in words.
+ * The threshold parameter is 1 based, and it is converted (threshold - 1)
+ * for the THRSH1 register.
+ */
+static void omap_mcbsp_set_rx_threshold(struct omap_mcbsp *mcbsp, u16 threshold)
+{
+       if (threshold && threshold <= mcbsp->max_rx_thres)
+               MCBSP_WRITE(mcbsp, THRSH1, threshold - 1);
+}
+
+/*
+ * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO
+ */
+static u16 omap_mcbsp_get_tx_delay(struct omap_mcbsp *mcbsp)
+{
+       u16 buffstat;
+
+       /* Returns the number of free locations in the buffer */
+       buffstat = MCBSP_READ(mcbsp, XBUFFSTAT);
+
+       /* Number of slots are different in McBSP ports */
+       return mcbsp->pdata->buffer_size - buffstat;
+}
+
+/*
+ * omap_mcbsp_get_rx_delay returns the number of free slots in the McBSP FIFO
+ * to reach the threshold value (when the DMA will be triggered to read it)
+ */
+static u16 omap_mcbsp_get_rx_delay(struct omap_mcbsp *mcbsp)
+{
+       u16 buffstat, threshold;
+
+       /* Returns the number of used locations in the buffer */
+       buffstat = MCBSP_READ(mcbsp, RBUFFSTAT);
+       /* RX threshold */
+       threshold = MCBSP_READ(mcbsp, THRSH1);
+
+       /* Return the number of location till we reach the threshold limit */
+       if (threshold <= buffstat)
+               return 0;
+       else
+               return threshold - buffstat;
+}
+
+static int omap_mcbsp_request(struct omap_mcbsp *mcbsp)
+{
+       void *reg_cache;
+       int err;
+
+       reg_cache = kzalloc(mcbsp->reg_cache_size, GFP_KERNEL);
+       if (!reg_cache)
+               return -ENOMEM;
+
+       spin_lock(&mcbsp->lock);
+       if (!mcbsp->free) {
+               dev_err(mcbsp->dev, "McBSP%d is currently in use\n", mcbsp->id);
+               err = -EBUSY;
+               goto err_kfree;
+       }
+
+       mcbsp->free = false;
+       mcbsp->reg_cache = reg_cache;
+       spin_unlock(&mcbsp->lock);
+
+       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
+               mcbsp->pdata->ops->request(mcbsp->id - 1);
+
+       /*
+        * Make sure that transmitter, receiver and sample-rate generator are
+        * not running before activating IRQs.
+        */
+       MCBSP_WRITE(mcbsp, SPCR1, 0);
+       MCBSP_WRITE(mcbsp, SPCR2, 0);
+
+       if (mcbsp->irq) {
+               err = request_irq(mcbsp->irq, omap_mcbsp_irq_handler, 0,
+                                 "McBSP", (void *)mcbsp);
+               if (err != 0) {
+                       dev_err(mcbsp->dev, "Unable to request IRQ\n");
+                       goto err_clk_disable;
+               }
+       } else {
+               err = request_irq(mcbsp->tx_irq, omap_mcbsp_tx_irq_handler, 0,
+                                 "McBSP TX", (void *)mcbsp);
+               if (err != 0) {
+                       dev_err(mcbsp->dev, "Unable to request TX IRQ\n");
+                       goto err_clk_disable;
+               }
+
+               err = request_irq(mcbsp->rx_irq, omap_mcbsp_rx_irq_handler, 0,
+                                 "McBSP RX", (void *)mcbsp);
+               if (err != 0) {
+                       dev_err(mcbsp->dev, "Unable to request RX IRQ\n");
+                       goto err_free_irq;
+               }
+       }
+
+       return 0;
+err_free_irq:
+       free_irq(mcbsp->tx_irq, (void *)mcbsp);
+err_clk_disable:
+       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
+               mcbsp->pdata->ops->free(mcbsp->id - 1);
+
+       /* Disable wakeup behavior */
+       if (mcbsp->pdata->has_wakeup)
+               MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
+
+       spin_lock(&mcbsp->lock);
+       mcbsp->free = true;
+       mcbsp->reg_cache = NULL;
+err_kfree:
+       spin_unlock(&mcbsp->lock);
+       kfree(reg_cache);
+
+       return err;
+}
+
+static void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
+{
+       void *reg_cache;
+
+       if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
+               mcbsp->pdata->ops->free(mcbsp->id - 1);
+
+       /* Disable wakeup behavior */
+       if (mcbsp->pdata->has_wakeup)
+               MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
+
+       /* Disable interrupt requests */
+       if (mcbsp->irq)
+               MCBSP_WRITE(mcbsp, IRQEN, 0);
+
+       if (mcbsp->irq) {
+               free_irq(mcbsp->irq, (void *)mcbsp);
+       } else {
+               free_irq(mcbsp->rx_irq, (void *)mcbsp);
+               free_irq(mcbsp->tx_irq, (void *)mcbsp);
+       }
+
+       reg_cache = mcbsp->reg_cache;
+
+       /*
+        * Select CLKS source from internal source unconditionally before
+        * marking the McBSP port as free.
+        * If the external clock source via MCBSP_CLKS pin has been selected the
+        * system will refuse to enter idle if the CLKS pin source is not reset
+        * back to internal source.
+        */
+       if (!mcbsp_omap1())
+               omap2_mcbsp_set_clks_src(mcbsp, MCBSP_CLKS_PRCM_SRC);
+
+       spin_lock(&mcbsp->lock);
+       if (mcbsp->free)
+               dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id);
+       else
+               mcbsp->free = true;
+       mcbsp->reg_cache = NULL;
+       spin_unlock(&mcbsp->lock);
+
+       kfree(reg_cache);
+}
+
+/*
+ * Here we start the McBSP, by enabling transmitter, receiver or both.
+ * If no transmitter or receiver is active prior calling, then sample-rate
+ * generator and frame sync are started.
+ */
+static void omap_mcbsp_start(struct omap_mcbsp *mcbsp, int stream)
+{
+       int tx = (stream == SNDRV_PCM_STREAM_PLAYBACK);
+       int rx = !tx;
+       int enable_srg = 0;
+       u16 w;
+
+       if (mcbsp->st_data)
+               omap_mcbsp_st_start(mcbsp);
+
+       /* Only enable SRG, if McBSP is master */
+       w = MCBSP_READ_CACHE(mcbsp, PCR0);
+       if (w & (FSXM | FSRM | CLKXM | CLKRM))
+               enable_srg = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
+                               MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
+
+       if (enable_srg) {
+               /* Start the sample generator */
+               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
+               MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 6));
+       }
+
+       /* Enable transmitter and receiver */
+       tx &= 1;
+       w = MCBSP_READ_CACHE(mcbsp, SPCR2);
+       MCBSP_WRITE(mcbsp, SPCR2, w | tx);
+
+       rx &= 1;
+       w = MCBSP_READ_CACHE(mcbsp, SPCR1);
+       MCBSP_WRITE(mcbsp, SPCR1, w | rx);
+
+       /*
+        * Worst case: CLKSRG*2 = 8000khz: (1/8000) * 2 * 2 usec
+        * REVISIT: 100us may give enough time for two CLKSRG, however
+        * due to some unknown PM related, clock gating etc. reason it
+        * is now at 500us.
+        */
+       udelay(500);
+
+       if (enable_srg) {
+               /* Start frame sync */
+               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
+               MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 7));
+       }
+
+       if (mcbsp->pdata->has_ccr) {
+               /* Release the transmitter and receiver */
+               w = MCBSP_READ_CACHE(mcbsp, XCCR);
+               w &= ~(tx ? XDISABLE : 0);
+               MCBSP_WRITE(mcbsp, XCCR, w);
+               w = MCBSP_READ_CACHE(mcbsp, RCCR);
+               w &= ~(rx ? RDISABLE : 0);
+               MCBSP_WRITE(mcbsp, RCCR, w);
+       }
+
+       /* Dump McBSP Regs */
+       omap_mcbsp_dump_reg(mcbsp);
+}
+
+static void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int stream)
+{
+       int tx = (stream == SNDRV_PCM_STREAM_PLAYBACK);
+       int rx = !tx;
+       int idle;
+       u16 w;
+
+       /* Reset transmitter */
+       tx &= 1;
+       if (mcbsp->pdata->has_ccr) {
+               w = MCBSP_READ_CACHE(mcbsp, XCCR);
+               w |= (tx ? XDISABLE : 0);
+               MCBSP_WRITE(mcbsp, XCCR, w);
+       }
+       w = MCBSP_READ_CACHE(mcbsp, SPCR2);
+       MCBSP_WRITE(mcbsp, SPCR2, w & ~tx);
+
+       /* Reset receiver */
+       rx &= 1;
+       if (mcbsp->pdata->has_ccr) {
+               w = MCBSP_READ_CACHE(mcbsp, RCCR);
+               w |= (rx ? RDISABLE : 0);
+               MCBSP_WRITE(mcbsp, RCCR, w);
+       }
+       w = MCBSP_READ_CACHE(mcbsp, SPCR1);
+       MCBSP_WRITE(mcbsp, SPCR1, w & ~rx);
+
+       idle = !((MCBSP_READ_CACHE(mcbsp, SPCR2) |
+                       MCBSP_READ_CACHE(mcbsp, SPCR1)) & 1);
+
+       if (idle) {
+               /* Reset the sample rate generator */
+               w = MCBSP_READ_CACHE(mcbsp, SPCR2);
+               MCBSP_WRITE(mcbsp, SPCR2, w & ~(1 << 6));
+       }
+
+       if (mcbsp->st_data)
+               omap_mcbsp_st_stop(mcbsp);
+}
+
+#define max_thres(m)                   (mcbsp->pdata->buffer_size)
+#define valid_threshold(m, val)                ((val) <= max_thres(m))
+#define THRESHOLD_PROP_BUILDER(prop)                                   \
+static ssize_t prop##_show(struct device *dev,                         \
+                       struct device_attribute *attr, char *buf)       \
+{                                                                      \
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);                \
+                                                                       \
+       return sprintf(buf, "%u\n", mcbsp->prop);                       \
+}                                                                      \
+                                                                       \
+static ssize_t prop##_store(struct device *dev,                                \
+                               struct device_attribute *attr,          \
+                               const char *buf, size_t size)           \
+{                                                                      \
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);                \
+       unsigned long val;                                              \
+       int status;                                                     \
+                                                                       \
+       status = kstrtoul(buf, 0, &val);                                \
+       if (status)                                                     \
+               return status;                                          \
+                                                                       \
+       if (!valid_threshold(mcbsp, val))                               \
+               return -EDOM;                                           \
+                                                                       \
+       mcbsp->prop = val;                                              \
+       return size;                                                    \
+}                                                                      \
+                                                                       \
+static DEVICE_ATTR(prop, 0644, prop##_show, prop##_store)
+
+THRESHOLD_PROP_BUILDER(max_tx_thres);
+THRESHOLD_PROP_BUILDER(max_rx_thres);
+
+static const char * const dma_op_modes[] = {
+       "element", "threshold",
+};
+
+static ssize_t dma_op_mode_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
+       int dma_op_mode, i = 0;
+       ssize_t len = 0;
+       const char * const *s;
+
+       dma_op_mode = mcbsp->dma_op_mode;
+
+       for (s = &dma_op_modes[i]; i < ARRAY_SIZE(dma_op_modes); s++, i++) {
+               if (dma_op_mode == i)
+                       len += sprintf(buf + len, "[%s] ", *s);
+               else
+                       len += sprintf(buf + len, "%s ", *s);
+       }
+       len += sprintf(buf + len, "\n");
+
+       return len;
+}
+
+static ssize_t dma_op_mode_store(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
+                                size_t size)
+{
+       struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
+       int i;
+
+       i = sysfs_match_string(dma_op_modes, buf);
+       if (i < 0)
+               return i;
+
+       spin_lock_irq(&mcbsp->lock);
+       if (!mcbsp->free) {
+               size = -EBUSY;
+               goto unlock;
+       }
+       mcbsp->dma_op_mode = i;
+
+unlock:
+       spin_unlock_irq(&mcbsp->lock);
+
+       return size;
+}
+
+static DEVICE_ATTR_RW(dma_op_mode);
+
+static const struct attribute *additional_attrs[] = {
+       &dev_attr_max_tx_thres.attr,
+       &dev_attr_max_rx_thres.attr,
+       &dev_attr_dma_op_mode.attr,
+       NULL,
+};
+
+static const struct attribute_group additional_attr_group = {
+       .attrs = (struct attribute **)additional_attrs,
+};
+
+/*
+ * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.
+ * 730 has only 2 McBSP, and both of them are MPU peripherals.
+ */
+static int omap_mcbsp_init(struct platform_device *pdev)
+{
+       struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
+       struct resource *res;
+       int ret = 0;
+
+       spin_lock_init(&mcbsp->lock);
+       mcbsp->free = true;
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
+       if (!res)
+               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+       mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mcbsp->io_base))
+               return PTR_ERR(mcbsp->io_base);
+
+       mcbsp->phys_base = res->start;
+       mcbsp->reg_cache_size = resource_size(res);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");
+       if (!res)
+               mcbsp->phys_dma_base = mcbsp->phys_base;
+       else
+               mcbsp->phys_dma_base = res->start;
+
+       /*
+        * OMAP1, 2 uses two interrupt lines: TX, RX
+        * OMAP2430, OMAP3 SoC have combined IRQ line as well.
+        * OMAP4 and newer SoC only have the combined IRQ line.
+        * Use the combined IRQ if available since it gives better debugging
+        * possibilities.
+        */
+       mcbsp->irq = platform_get_irq_byname(pdev, "common");
+       if (mcbsp->irq == -ENXIO) {
+               mcbsp->tx_irq = platform_get_irq_byname(pdev, "tx");
+
+               if (mcbsp->tx_irq == -ENXIO) {
+                       mcbsp->irq = platform_get_irq(pdev, 0);
+                       mcbsp->tx_irq = 0;
+               } else {
+                       mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx");
+                       mcbsp->irq = 0;
+               }
+       }
+
+       if (!pdev->dev.of_node) {
+               res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
+               if (!res) {
+                       dev_err(&pdev->dev, "invalid tx DMA channel\n");
+                       return -ENODEV;
+               }
+               mcbsp->dma_req[0] = res->start;
+               mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
+
+               res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
+               if (!res) {
+                       dev_err(&pdev->dev, "invalid rx DMA channel\n");
+                       return -ENODEV;
+               }
+               mcbsp->dma_req[1] = res->start;
+               mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
+       } else {
+               mcbsp->dma_data[0].filter_data = "tx";
+               mcbsp->dma_data[1].filter_data = "rx";
+       }
+
+       mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp,
+                                               SNDRV_PCM_STREAM_PLAYBACK);
+       mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp,
+                                               SNDRV_PCM_STREAM_CAPTURE);
+
+       mcbsp->fclk = clk_get(&pdev->dev, "fck");
+       if (IS_ERR(mcbsp->fclk)) {
+               ret = PTR_ERR(mcbsp->fclk);
+               dev_err(mcbsp->dev, "unable to get fck: %d\n", ret);
+               return ret;
+       }
+
+       mcbsp->dma_op_mode = MCBSP_DMA_MODE_ELEMENT;
+       if (mcbsp->pdata->buffer_size) {
+               /*
+                * Initially configure the maximum thresholds to a safe value.
+                * The McBSP FIFO usage with these values should not go under
+                * 16 locations.
+                * If the whole FIFO without safety buffer is used, than there
+                * is a possibility that the DMA will be not able to push the
+                * new data on time, causing channel shifts in runtime.
+                */
+               mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10;
+               mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10;
+
+               ret = sysfs_create_group(&mcbsp->dev->kobj,
+                                        &additional_attr_group);
+               if (ret) {
+                       dev_err(mcbsp->dev,
+                               "Unable to create additional controls\n");
+                       goto err_thres;
+               }
+       } else {
+               mcbsp->max_tx_thres = -EINVAL;
+               mcbsp->max_rx_thres = -EINVAL;
+       }
+
+       ret = omap_mcbsp_st_init(pdev);
+       if (ret)
+               goto err_st;
+
+       return 0;
+
+err_st:
+       if (mcbsp->pdata->buffer_size)
+               sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
+err_thres:
+       clk_put(mcbsp->fclk);
+       return ret;
+}
+
 /*
  * Stream DMA parameters. DMA request line and port address are set runtime
  * since they are different between OMAP1 and later OMAPs
@@ -656,132 +1343,6 @@ static const struct snd_soc_component_driver omap_mcbsp_component = {
        .name           = "omap-mcbsp",
 };
 
-static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
-                       struct snd_ctl_elem_info *uinfo)
-{
-       struct soc_mixer_control *mc =
-               (struct soc_mixer_control *)kcontrol->private_value;
-       int max = mc->max;
-       int min = mc->min;
-
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-       uinfo->count = 1;
-       uinfo->value.integer.min = min;
-       uinfo->value.integer.max = max;
-       return 0;
-}
-
-#define OMAP_MCBSP_ST_CHANNEL_VOLUME(channel)                          \
-static int                                                             \
-omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc,                \
-                                       struct snd_ctl_elem_value *uc)  \
-{                                                                      \
-       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
-       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);    \
-       struct soc_mixer_control *mc =                                  \
-               (struct soc_mixer_control *)kc->private_value;          \
-       int max = mc->max;                                              \
-       int min = mc->min;                                              \
-       int val = uc->value.integer.value[0];                           \
-                                                                       \
-       if (val < min || val > max)                                     \
-               return -EINVAL;                                         \
-                                                                       \
-       /* OMAP McBSP implementation uses index values 0..4 */          \
-       return omap_st_set_chgain(mcbsp, channel, val);                 \
-}                                                                      \
-                                                                       \
-static int                                                             \
-omap_mcbsp_get_st_ch##channel##_volume(struct snd_kcontrol *kc,                \
-                                       struct snd_ctl_elem_value *uc)  \
-{                                                                      \
-       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
-       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);    \
-       s16 chgain;                                                     \
-                                                                       \
-       if (omap_st_get_chgain(mcbsp, channel, &chgain))                \
-               return -EAGAIN;                                         \
-                                                                       \
-       uc->value.integer.value[0] = chgain;                            \
-       return 0;                                                       \
-}
-
-OMAP_MCBSP_ST_CHANNEL_VOLUME(0)
-OMAP_MCBSP_ST_CHANNEL_VOLUME(1)
-
-static int omap_mcbsp_st_put_mode(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *ucontrol)
-{
-       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
-       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
-       u8 value = ucontrol->value.integer.value[0];
-
-       if (value == omap_st_is_enabled(mcbsp))
-               return 0;
-
-       if (value)
-               omap_st_enable(mcbsp);
-       else
-               omap_st_disable(mcbsp);
-
-       return 1;
-}
-
-static int omap_mcbsp_st_get_mode(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *ucontrol)
-{
-       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
-       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
-
-       ucontrol->value.integer.value[0] = omap_st_is_enabled(mcbsp);
-       return 0;
-}
-
-#define OMAP_MCBSP_ST_CONTROLS(port)                                     \
-static const struct snd_kcontrol_new omap_mcbsp##port##_st_controls[] = { \
-SOC_SINGLE_EXT("McBSP" #port " Sidetone Switch", 1, 0, 1, 0,             \
-              omap_mcbsp_st_get_mode, omap_mcbsp_st_put_mode),           \
-OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 0 Volume", \
-                             -32768, 32767,                              \
-                             omap_mcbsp_get_st_ch0_volume,               \
-                             omap_mcbsp_set_st_ch0_volume),              \
-OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 1 Volume", \
-                             -32768, 32767,                              \
-                             omap_mcbsp_get_st_ch1_volume,               \
-                             omap_mcbsp_set_st_ch1_volume),              \
-}
-
-OMAP_MCBSP_ST_CONTROLS(2);
-OMAP_MCBSP_ST_CONTROLS(3);
-
-int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id)
-{
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-       struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
-
-       if (!mcbsp->st_data) {
-               dev_warn(mcbsp->dev, "No sidetone data for port\n");
-               return 0;
-       }
-
-       switch (port_id) {
-       case 2: /* McBSP 2 */
-               return snd_soc_add_dai_controls(cpu_dai,
-                                       omap_mcbsp2_st_controls,
-                                       ARRAY_SIZE(omap_mcbsp2_st_controls));
-       case 3: /* McBSP 3 */
-               return snd_soc_add_dai_controls(cpu_dai,
-                                       omap_mcbsp3_st_controls,
-                                       ARRAY_SIZE(omap_mcbsp3_st_controls));
-       default:
-               dev_err(mcbsp->dev, "Port %d not supported\n", port_id);
-               break;
-       }
-
-       return -EINVAL;
-}
-EXPORT_SYMBOL_GPL(omap_mcbsp_st_add_controls);
-
 static struct omap_mcbsp_platform_data omap2420_pdata = {
        .reg_step = 4,
        .reg_size = 2,
@@ -893,7 +1454,10 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
        if (pm_qos_request_active(&mcbsp->pm_qos_req))
                pm_qos_remove_request(&mcbsp->pm_qos_req);
 
-       omap_mcbsp_cleanup(mcbsp);
+       if (mcbsp->pdata->buffer_size)
+               sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
+
+       omap_mcbsp_st_cleanup(pdev);
 
        clk_put(mcbsp->fclk);
 
index 2e3369c..7911d24 100644 (file)
  *
  */
 
-#ifndef __OMAP_I2S_H__
-#define __OMAP_I2S_H__
+#ifndef __OMAP_MCBSP_H__
+#define __OMAP_MCBSP_H__
+
+#include <sound/dmaengine_pcm.h>
 
 /* Source clocks for McBSP sample rate generator */
 enum omap_mcbsp_clksrg_clk {
@@ -41,4 +43,4 @@ enum omap_mcbsp_div {
 
 int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id);
 
-#endif
+#endif /* __OMAP_MCBSP_H__ */