diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-11-14 11:35:26 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-10 11:22:15 +0000 |
| commit | 21400a72d6bba3d233161ad131e36b6b7f78381e (patch) | |
| tree | 4804cbe117a0b4c06b818d9f7b6a7babc4a460ad /sound/soc | |
| parent | 02e08d9b6bd67784d4c58e659c21674b31972c34 (diff) | |
ASoC: davinci-mcasp: Move private struct definition to source file
Since it is a private struct strictly used by the davinci-mcasp driver it
can be moved from header file to the source file.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 30 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.h | 35 |
2 files changed, 30 insertions, 35 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 1c1585e18eae..70107956dd0c 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -37,6 +37,36 @@ #define DAVINCI_MCASP_NUM_SERIALIZER 16 +struct davinci_audio_dev { + struct davinci_pcm_dma_params dma_params[2]; + void __iomem *base; + struct device *dev; + + /* McASP specific data */ + int tdm_slots; + u8 op_mode; + u8 num_serializer; + u8 *serial_dir; + u8 version; + u16 bclk_lrclk_ratio; + + /* McASP FIFO related */ + u8 txnumevt; + u8 rxnumevt; + +#ifdef CONFIG_PM_SLEEP + struct { + u32 txfmtctl; + u32 rxfmtctl; + u32 txfmt; + u32 rxfmt; + u32 aclkxctl; + u32 aclkrctl; + u32 pdir; + } context; +#endif +}; + static inline void mcasp_set_bits(void __iomem *reg, u32 val) { __raw_writel(__raw_readl(reg) | val, reg); diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 619b98befc84..80e5a1846687 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -18,11 +18,6 @@ #ifndef DAVINCI_MCASP_H #define DAVINCI_MCASP_H -#include <linux/io.h> -#include <linux/platform_data/davinci_asp.h> - -#include "davinci-pcm.h" - /* * McASP register definitions */ @@ -290,34 +285,4 @@ #define NUMEVT_MASK (0xFF << 8) #define NUMDMA_MASK (0xFF) -struct davinci_audio_dev { - struct davinci_pcm_dma_params dma_params[2]; - void __iomem *base; - struct device *dev; - - /* McASP specific data */ - int tdm_slots; - u8 op_mode; - u8 num_serializer; - u8 *serial_dir; - u8 version; - u16 bclk_lrclk_ratio; - - /* McASP FIFO related */ - u8 txnumevt; - u8 rxnumevt; - -#ifdef CONFIG_PM_SLEEP - struct { - u32 txfmtctl; - u32 rxfmtctl; - u32 txfmt; - u32 rxfmt; - u32 aclkxctl; - u32 aclkrctl; - u32 pdir; - } context; -#endif -}; - #endif /* DAVINCI_MCASP_H */ |