diff options
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-audio.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-audio.c | 68 |
1 files changed, 12 insertions, 56 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index aba9e5692958..bfe443daf4b0 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c | |||
@@ -21,28 +21,14 @@ | |||
21 | 21 | ||
22 | static struct stedma40_chan_cfg msp0_dma_rx = { | 22 | static struct stedma40_chan_cfg msp0_dma_rx = { |
23 | .high_priority = true, | 23 | .high_priority = true, |
24 | .dir = STEDMA40_PERIPH_TO_MEM, | 24 | .dir = DMA_DEV_TO_MEM, |
25 | 25 | .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, | |
26 | .src_dev_type = DB8500_DMA_DEV31_MSP0_RX_SLIM0_CH0_RX, | ||
27 | .dst_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
28 | |||
29 | .src_info.psize = STEDMA40_PSIZE_LOG_4, | ||
30 | .dst_info.psize = STEDMA40_PSIZE_LOG_4, | ||
31 | |||
32 | /* data_width is set during configuration */ | ||
33 | }; | 26 | }; |
34 | 27 | ||
35 | static struct stedma40_chan_cfg msp0_dma_tx = { | 28 | static struct stedma40_chan_cfg msp0_dma_tx = { |
36 | .high_priority = true, | 29 | .high_priority = true, |
37 | .dir = STEDMA40_MEM_TO_PERIPH, | 30 | .dir = DMA_MEM_TO_DEV, |
38 | 31 | .dev_type = DB8500_DMA_DEV31_MSP0_SLIM0_CH0, | |
39 | .src_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
40 | .dst_dev_type = DB8500_DMA_DEV31_MSP0_TX_SLIM0_CH0_TX, | ||
41 | |||
42 | .src_info.psize = STEDMA40_PSIZE_LOG_4, | ||
43 | .dst_info.psize = STEDMA40_PSIZE_LOG_4, | ||
44 | |||
45 | /* data_width is set during configuration */ | ||
46 | }; | 32 | }; |
47 | 33 | ||
48 | struct msp_i2s_platform_data msp0_platform_data = { | 34 | struct msp_i2s_platform_data msp0_platform_data = { |
@@ -53,28 +39,14 @@ struct msp_i2s_platform_data msp0_platform_data = { | |||
53 | 39 | ||
54 | static struct stedma40_chan_cfg msp1_dma_rx = { | 40 | static struct stedma40_chan_cfg msp1_dma_rx = { |
55 | .high_priority = true, | 41 | .high_priority = true, |
56 | .dir = STEDMA40_PERIPH_TO_MEM, | 42 | .dir = DMA_DEV_TO_MEM, |
57 | 43 | .dev_type = DB8500_DMA_DEV30_MSP3, | |
58 | .src_dev_type = DB8500_DMA_DEV30_MSP3_RX, | ||
59 | .dst_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
60 | |||
61 | .src_info.psize = STEDMA40_PSIZE_LOG_4, | ||
62 | .dst_info.psize = STEDMA40_PSIZE_LOG_4, | ||
63 | |||
64 | /* data_width is set during configuration */ | ||
65 | }; | 44 | }; |
66 | 45 | ||
67 | static struct stedma40_chan_cfg msp1_dma_tx = { | 46 | static struct stedma40_chan_cfg msp1_dma_tx = { |
68 | .high_priority = true, | 47 | .high_priority = true, |
69 | .dir = STEDMA40_MEM_TO_PERIPH, | 48 | .dir = DMA_MEM_TO_DEV, |
70 | 49 | .dev_type = DB8500_DMA_DEV30_MSP1, | |
71 | .src_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
72 | .dst_dev_type = DB8500_DMA_DEV30_MSP1_TX, | ||
73 | |||
74 | .src_info.psize = STEDMA40_PSIZE_LOG_4, | ||
75 | .dst_info.psize = STEDMA40_PSIZE_LOG_4, | ||
76 | |||
77 | /* data_width is set during configuration */ | ||
78 | }; | 50 | }; |
79 | 51 | ||
80 | struct msp_i2s_platform_data msp1_platform_data = { | 52 | struct msp_i2s_platform_data msp1_platform_data = { |
@@ -85,32 +57,16 @@ struct msp_i2s_platform_data msp1_platform_data = { | |||
85 | 57 | ||
86 | static struct stedma40_chan_cfg msp2_dma_rx = { | 58 | static struct stedma40_chan_cfg msp2_dma_rx = { |
87 | .high_priority = true, | 59 | .high_priority = true, |
88 | .dir = STEDMA40_PERIPH_TO_MEM, | 60 | .dir = DMA_DEV_TO_MEM, |
89 | 61 | .dev_type = DB8500_DMA_DEV14_MSP2, | |
90 | .src_dev_type = DB8500_DMA_DEV14_MSP2_RX, | ||
91 | .dst_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
92 | |||
93 | /* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */ | ||
94 | .src_info.psize = STEDMA40_PSIZE_LOG_1, | ||
95 | .dst_info.psize = STEDMA40_PSIZE_LOG_1, | ||
96 | |||
97 | /* data_width is set during configuration */ | ||
98 | }; | 62 | }; |
99 | 63 | ||
100 | static struct stedma40_chan_cfg msp2_dma_tx = { | 64 | static struct stedma40_chan_cfg msp2_dma_tx = { |
101 | .high_priority = true, | 65 | .high_priority = true, |
102 | .dir = STEDMA40_MEM_TO_PERIPH, | 66 | .dir = DMA_MEM_TO_DEV, |
103 | 67 | .dev_type = DB8500_DMA_DEV14_MSP2, | |
104 | .src_dev_type = STEDMA40_DEV_DST_MEMORY, | ||
105 | .dst_dev_type = DB8500_DMA_DEV14_MSP2_TX, | ||
106 | |||
107 | .src_info.psize = STEDMA40_PSIZE_LOG_4, | ||
108 | .dst_info.psize = STEDMA40_PSIZE_LOG_4, | ||
109 | |||
110 | .use_fixed_channel = true, | 68 | .use_fixed_channel = true, |
111 | .phy_channel = 1, | 69 | .phy_channel = 1, |
112 | |||
113 | /* data_width is set during configuration */ | ||
114 | }; | 70 | }; |
115 | 71 | ||
116 | static struct platform_device *db8500_add_msp_i2s(struct device *parent, | 72 | static struct platform_device *db8500_add_msp_i2s(struct device *parent, |