Commit 4bd04e2e authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij

ARM: ux500: Remove superfluous 'psize' attribute from Audio platform data

'psize' is used to calculate the maximum DMA burst size. However it
is only taken into consideration when editing the DMA channel's
configuration. The Audio DMA platform data is only used to allocate
a channel, not configure it. That will be done at a later date within
the MSP driver.

We're also removing comments which are no longer required, as
'data_width' is no longer set in any device's platform data period.
Tested-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c86519c1
...@@ -22,25 +22,13 @@ ...@@ -22,25 +22,13 @@
static struct stedma40_chan_cfg msp0_dma_rx = { static struct stedma40_chan_cfg msp0_dma_rx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_PERIPH_TO_MEM, .dir = STEDMA40_PERIPH_TO_MEM,
.dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
/* data_width is set during configuration */
}; };
static struct stedma40_chan_cfg msp0_dma_tx = { static struct stedma40_chan_cfg msp0_dma_tx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_MEM_TO_PERIPH, .dir = STEDMA40_MEM_TO_PERIPH,
.dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
/* data_width is set during configuration */
}; };
struct msp_i2s_platform_data msp0_platform_data = { struct msp_i2s_platform_data msp0_platform_data = {
...@@ -52,25 +40,13 @@ struct msp_i2s_platform_data msp0_platform_data = { ...@@ -52,25 +40,13 @@ struct msp_i2s_platform_data msp0_platform_data = {
static struct stedma40_chan_cfg msp1_dma_rx = { static struct stedma40_chan_cfg msp1_dma_rx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_PERIPH_TO_MEM, .dir = STEDMA40_PERIPH_TO_MEM,
.dev_type = DB8500_DMA_DEV30_MSP3, .dev_type = DB8500_DMA_DEV30_MSP3,
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
/* data_width is set during configuration */
}; };
static struct stedma40_chan_cfg msp1_dma_tx = { static struct stedma40_chan_cfg msp1_dma_tx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_MEM_TO_PERIPH, .dir = STEDMA40_MEM_TO_PERIPH,
.dev_type = DB8500_DMA_DEV30_MSP1, .dev_type = DB8500_DMA_DEV30_MSP1,
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
/* data_width is set during configuration */
}; };
struct msp_i2s_platform_data msp1_platform_data = { struct msp_i2s_platform_data msp1_platform_data = {
...@@ -82,29 +58,15 @@ struct msp_i2s_platform_data msp1_platform_data = { ...@@ -82,29 +58,15 @@ struct msp_i2s_platform_data msp1_platform_data = {
static struct stedma40_chan_cfg msp2_dma_rx = { static struct stedma40_chan_cfg msp2_dma_rx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_PERIPH_TO_MEM, .dir = STEDMA40_PERIPH_TO_MEM,
.dev_type = DB8500_DMA_DEV14_MSP2, .dev_type = DB8500_DMA_DEV14_MSP2,
/* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */
.src_info.psize = STEDMA40_PSIZE_LOG_1,
.dst_info.psize = STEDMA40_PSIZE_LOG_1,
/* data_width is set during configuration */
}; };
static struct stedma40_chan_cfg msp2_dma_tx = { static struct stedma40_chan_cfg msp2_dma_tx = {
.high_priority = true, .high_priority = true,
.dir = STEDMA40_MEM_TO_PERIPH, .dir = STEDMA40_MEM_TO_PERIPH,
.dev_type = DB8500_DMA_DEV14_MSP2, .dev_type = DB8500_DMA_DEV14_MSP2,
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
.use_fixed_channel = true, .use_fixed_channel = true,
.phy_channel = 1, .phy_channel = 1,
/* data_width is set during configuration */
}; };
static struct platform_device *db8500_add_msp_i2s(struct device *parent, static struct platform_device *db8500_add_msp_i2s(struct device *parent,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment