aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-05-03 10:32:02 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-05-23 15:12:41 -0400
commit4bd04e2ed415754a38118399328bc2c494f68632 (patch)
treece7a8e073009358a1e83b3bc409700643945debe /arch/arm/mach-ux500
parentc86519c1ab025969e551441bb35bb8ec28f8cff0 (diff)
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: Fabio Baltieri <fabio.baltieri@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500-audio.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index 5a968fa8b90c..ec872622340f 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -22,25 +22,13 @@
22static struct stedma40_chan_cfg msp0_dma_rx = { 22static struct stedma40_chan_cfg msp0_dma_rx = {
23 .high_priority = true, 23 .high_priority = true,
24 .dir = STEDMA40_PERIPH_TO_MEM, 24 .dir = STEDMA40_PERIPH_TO_MEM,
25
26 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, 25 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
27
28 .src_info.psize = STEDMA40_PSIZE_LOG_4,
29 .dst_info.psize = STEDMA40_PSIZE_LOG_4,
30
31 /* data_width is set during configuration */
32}; 26};
33 27
34static struct stedma40_chan_cfg msp0_dma_tx = { 28static struct stedma40_chan_cfg msp0_dma_tx = {
35 .high_priority = true, 29 .high_priority = true,
36 .dir = STEDMA40_MEM_TO_PERIPH, 30 .dir = STEDMA40_MEM_TO_PERIPH,
37
38 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, 31 .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0,
39
40 .src_info.psize = STEDMA40_PSIZE_LOG_4,
41 .dst_info.psize = STEDMA40_PSIZE_LOG_4,
42
43 /* data_width is set during configuration */
44}; 32};
45 33
46struct msp_i2s_platform_data msp0_platform_data = { 34struct msp_i2s_platform_data msp0_platform_data = {
@@ -52,25 +40,13 @@ struct msp_i2s_platform_data msp0_platform_data = {
52static struct stedma40_chan_cfg msp1_dma_rx = { 40static struct stedma40_chan_cfg msp1_dma_rx = {
53 .high_priority = true, 41 .high_priority = true,
54 .dir = STEDMA40_PERIPH_TO_MEM, 42 .dir = STEDMA40_PERIPH_TO_MEM,
55
56 .dev_type = DB8500_DMA_DEV30_MSP3, 43 .dev_type = DB8500_DMA_DEV30_MSP3,
57
58 .src_info.psize = STEDMA40_PSIZE_LOG_4,
59 .dst_info.psize = STEDMA40_PSIZE_LOG_4,
60
61 /* data_width is set during configuration */
62}; 44};
63 45
64static struct stedma40_chan_cfg msp1_dma_tx = { 46static struct stedma40_chan_cfg msp1_dma_tx = {
65 .high_priority = true, 47 .high_priority = true,
66 .dir = STEDMA40_MEM_TO_PERIPH, 48 .dir = STEDMA40_MEM_TO_PERIPH,
67
68 .dev_type = DB8500_DMA_DEV30_MSP1, 49 .dev_type = DB8500_DMA_DEV30_MSP1,
69
70 .src_info.psize = STEDMA40_PSIZE_LOG_4,
71 .dst_info.psize = STEDMA40_PSIZE_LOG_4,
72
73 /* data_width is set during configuration */
74}; 50};
75 51
76struct msp_i2s_platform_data msp1_platform_data = { 52struct msp_i2s_platform_data msp1_platform_data = {
@@ -82,29 +58,15 @@ struct msp_i2s_platform_data msp1_platform_data = {
82static struct stedma40_chan_cfg msp2_dma_rx = { 58static struct stedma40_chan_cfg msp2_dma_rx = {
83 .high_priority = true, 59 .high_priority = true,
84 .dir = STEDMA40_PERIPH_TO_MEM, 60 .dir = STEDMA40_PERIPH_TO_MEM,
85
86 .dev_type = DB8500_DMA_DEV14_MSP2, 61 .dev_type = DB8500_DMA_DEV14_MSP2,
87
88 /* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */
89 .src_info.psize = STEDMA40_PSIZE_LOG_1,
90 .dst_info.psize = STEDMA40_PSIZE_LOG_1,
91
92 /* data_width is set during configuration */
93}; 62};
94 63
95static struct stedma40_chan_cfg msp2_dma_tx = { 64static struct stedma40_chan_cfg msp2_dma_tx = {
96 .high_priority = true, 65 .high_priority = true,
97 .dir = STEDMA40_MEM_TO_PERIPH, 66 .dir = STEDMA40_MEM_TO_PERIPH,
98
99 .dev_type = DB8500_DMA_DEV14_MSP2, 67 .dev_type = DB8500_DMA_DEV14_MSP2,
100
101 .src_info.psize = STEDMA40_PSIZE_LOG_4,
102 .dst_info.psize = STEDMA40_PSIZE_LOG_4,
103
104 .use_fixed_channel = true, 68 .use_fixed_channel = true,
105 .phy_channel = 1, 69 .phy_channel = 1,
106
107 /* data_width is set during configuration */
108}; 70};
109 71
110static struct platform_device *db8500_add_msp_i2s(struct device *parent, 72static struct platform_device *db8500_add_msp_i2s(struct device *parent,