diff options
| author | Fabio Baltieri | 2013-06-12 09:57:57 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-06-12 18:01:42 +0200 |
| commit | f3fe53dd975306903be3616c87865a87a52fb20e (patch) | |
| tree | 5e37ab3cf44641cee68f45e06686a8a340db94b6 /sound/soc/ux500/ux500_msp_i2s.h | |
| parent | ASoC: ux500: Ensure consistent configuration between DAIs (diff) | |
| download | kernel-qcow2-linux-f3fe53dd975306903be3616c87865a87a52fb20e.tar.gz kernel-qcow2-linux-f3fe53dd975306903be3616c87865a87a52fb20e.tar.xz kernel-qcow2-linux-f3fe53dd975306903be3616c87865a87a52fb20e.zip | |
ASoC: ux500: Move DMA parameters into ux500_msp
Move struct ux500_msp_dma_params declaration from ux500_msp_i2s_drvdata
to ux500_msp, this saves some confusing pointer passing and allows to
access all DMA configuration fields from ux500_msp_i2s.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/ux500/ux500_msp_i2s.h')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 189a3751993b..879617147fc8 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -468,12 +468,17 @@ struct ux500_msp_config { unsigned int iodelay; }; +struct ux500_msp_dma_params { + unsigned int data_size; + struct stedma40_chan_cfg *dma_cfg; +}; + struct ux500_msp { enum msp_i2s_id id; void __iomem *registers; struct device *dev; - struct stedma40_chan_cfg *dma_cfg_rx; - struct stedma40_chan_cfg *dma_cfg_tx; + struct ux500_msp_dma_params playback_dma_data; + struct ux500_msp_dma_params capture_dma_data; enum msp_state msp_state; int def_elem_len; unsigned int dir_busy; @@ -481,11 +486,6 @@ struct ux500_msp { unsigned int f_bitclk; }; -struct ux500_msp_dma_params { - unsigned int data_size; - struct stedma40_chan_cfg *dma_cfg; -}; - struct msp_i2s_platform_data; int ux500_msp_i2s_init_msp(struct platform_device *pdev, struct ux500_msp **msp_p, |