diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index a001e4c052c2..e2b7c31ef372 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -194,6 +194,7 @@ static struct stedma40_platform_data dma40_plat_data = { | |||
194 | .memcpy_conf_phy = &dma40_memcpy_conf_phy, | 194 | .memcpy_conf_phy = &dma40_memcpy_conf_phy, |
195 | .memcpy_conf_log = &dma40_memcpy_conf_log, | 195 | .memcpy_conf_log = &dma40_memcpy_conf_log, |
196 | .llis_per_log = 8, | 196 | .llis_per_log = 8, |
197 | .disabled_channels = {-1}, | ||
197 | }; | 198 | }; |
198 | 199 | ||
199 | struct platform_device u8500_dma40_device = { | 200 | struct platform_device u8500_dma40_device = { |
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index 4d12ea4ca361..5fbde4b8dc12 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h | |||
@@ -148,7 +148,8 @@ struct stedma40_chan_cfg { | |||
148 | * @memcpy_conf_phy: default configuration of physical channel memcpy | 148 | * @memcpy_conf_phy: default configuration of physical channel memcpy |
149 | * @memcpy_conf_log: default configuration of logical channel memcpy | 149 | * @memcpy_conf_log: default configuration of logical channel memcpy |
150 | * @llis_per_log: number of max linked list items per logical channel | 150 | * @llis_per_log: number of max linked list items per logical channel |
151 | * | 151 | * @disabled_channels: A vector, ending with -1, that marks physical channels |
152 | * that are for different reasons not available for the driver. | ||
152 | */ | 153 | */ |
153 | struct stedma40_platform_data { | 154 | struct stedma40_platform_data { |
154 | u32 dev_len; | 155 | u32 dev_len; |
@@ -159,6 +160,7 @@ struct stedma40_platform_data { | |||
159 | struct stedma40_chan_cfg *memcpy_conf_phy; | 160 | struct stedma40_chan_cfg *memcpy_conf_phy; |
160 | struct stedma40_chan_cfg *memcpy_conf_log; | 161 | struct stedma40_chan_cfg *memcpy_conf_log; |
161 | unsigned int llis_per_log; | 162 | unsigned int llis_per_log; |
163 | int disabled_channels[8]; | ||
162 | }; | 164 | }; |
163 | 165 | ||
164 | /** | 166 | /** |