diff options
| author | Jonas Aaberg | 2010-06-20 23:26:45 +0200 |
|---|---|---|
| committer | Dan Williams | 2010-06-23 03:01:57 +0200 |
| commit | 595167253a20167efae704ff2a8f6e2ee66cf25f (patch) | |
| tree | 83c4ad1ab55b3dcea7855d6b8121af18fb7f5a0f /arch | |
| parent | DMAENGINE: ste_dma40: fix suspend bug (diff) | |
| download | kernel-qcow2-linux-595167253a20167efae704ff2a8f6e2ee66cf25f.tar.gz kernel-qcow2-linux-595167253a20167efae704ff2a8f6e2ee66cf25f.tar.xz kernel-qcow2-linux-595167253a20167efae704ff2a8f6e2ee66cf25f.zip | |
DMAENGINE: ste_dma40: no disabled phy channels on ux500
Make sure we have no disabled physical channels when we start on
the ux500 machines.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
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 = { .memcpy_conf_phy = &dma40_memcpy_conf_phy, .memcpy_conf_log = &dma40_memcpy_conf_log, .llis_per_log = 8, + .disabled_channels = {-1}, }; 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 { * @memcpy_conf_phy: default configuration of physical channel memcpy * @memcpy_conf_log: default configuration of logical channel memcpy * @llis_per_log: number of max linked list items per logical channel - * + * @disabled_channels: A vector, ending with -1, that marks physical channels + * that are for different reasons not available for the driver. */ struct stedma40_platform_data { u32 dev_len; @@ -159,6 +160,7 @@ struct stedma40_platform_data { struct stedma40_chan_cfg *memcpy_conf_phy; struct stedma40_chan_cfg *memcpy_conf_log; unsigned int llis_per_log; + int disabled_channels[8]; }; /** |