diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-02-14 15:23:15 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@ti.com> | 2012-03-12 13:34:22 +0000 |
| commit | 256d9c251fe6800a494206b96d2572e5a98762d5 (patch) | |
| tree | 1bca28ebdb698c636734f1fee8ff14ca60cc874c /sound/soc/omap/mcbsp.h | |
| parent | 2ee6595069f29b918b957a013debfae83e68724d (diff) | |
| download | linux-256d9c251fe6800a494206b96d2572e5a98762d5.tar.bz2 | |
ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure
Since the drivers has been merged, merge the two structures together.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/omap/mcbsp.h')
| -rw-r--r-- | sound/soc/omap/mcbsp.h | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index ac90c1a4a489..d250bcc952d2 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h @@ -269,27 +269,20 @@ struct omap_mcbsp_st_data { s16 ch1gain; }; -struct omap_mcbsp_data { - struct omap_mcbsp_reg_cfg regs; - struct omap_pcm_dma_data dma_data[2]; - unsigned int fmt; - /* - * Flags indicating is the bus already activated and configured by - * another substream - */ - int active; - int configured; - unsigned int in_freq; - int clk_div; - int wlen; -}; - 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 rx_irq; @@ -300,16 +293,20 @@ struct omap_mcbsp { u8 dma_tx_sync; /* Protect the field .free, while checking if the mcbsp is in use */ - spinlock_t lock; struct omap_mcbsp_platform_data *pdata; - struct clk *fclk; struct omap_mcbsp_st_data *st_data; - struct omap_mcbsp_data mcbsp_data; + struct omap_mcbsp_reg_cfg cfg_regs; + struct omap_pcm_dma_data dma_data[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; + int clk_div; + int wlen; }; void omap_mcbsp_config(struct omap_mcbsp *mcbsp, |