lkml.org 
[lkml]   [2010]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/19] DMAENGINE: ste_dma40: no disabled phy channels on ux500
    Date
    From: Jonas Aaberg <jonas.aberg@stericsson.com>

    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>
    ---
    arch/arm/mach-ux500/devices-db8500.c | 1 +
    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 a001e4c..e2b7c31 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 4d12ea4..5fbde4b 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];
    };

    /**
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-06-20 23:29    [W:0.026 / U:67.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site