[lkml]   [2012]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the arm-soc tree with the slave-dma tree
    Hi all,

    Today's linux-next merge of the arm-soc tree got a conflict in
    drivers/dma/imx-sdma.c between commit 2ccaef0520d1 ("dma: imx-sdma: make
    channel0 operations atomic") from the slave-dma tree and commit
    7560e3f3581e ("dmaengine i.MX SDMA: do not depend on grouped clocks")
    from the arm-soc tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    Stephen Rothwell

    diff --cc drivers/dma/imx-sdma.c
    index a472a29,fddccae..0000000
    --- a/drivers/dma/imx-sdma.c
    +++ b/drivers/dma/imx-sdma.c
    @@@ -323,8 -322,9 +323,9 @@@ struct sdma_engine
    struct sdma_context_data *context;
    dma_addr_t context_phys;
    struct dma_device dma_device;
    - struct clk *clk;
    + struct clk *clk_ipg;
    + struct clk *clk_ahb;
    - struct mutex channel_0_lock;
    + spinlock_t channel_0_lock;
    struct sdma_script_start_addrs *script_addrs;

    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-05-14 11:41    [W:0.021 / U:3.580 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site