lkml.org 
[lkml]   [2012]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the mmc tree with the slave-dma tree
    Hi Chris,

    Today's linux-next merge of the mmc tree got a conflict in
    drivers/mmc/host/sh_mmcif.c between commits 916001fe33b7 ("mmc: sh_mmcif:
    remove unneeded struct sh_mmcif_dma, prepare to shdma conversion") and
    0e79f9ae1610 ("mmc: sh_mmcif: switch to the new DMA channel allocation
    and configuration") from the slave-dma tree and commit bf68a812f06c
    ("mmc: sh-mmcif: add OF support, make platform data optional") from the
    mmc tree.

    I fixed it up (see below) and can carry the fix as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc drivers/mmc/host/sh_mmcif.c
    index 0f07d28,b2af713..0000000
    --- a/drivers/mmc/host/sh_mmcif.c
    +++ b/drivers/mmc/host/sh_mmcif.c
    @@@ -372,14 -376,17 +374,14 @@@ static void sh_mmcif_start_dma_tx(struc
    static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
    struct sh_mmcif_plat_data *pdata)
    {
    - struct sh_dmae_slave *tx, *rx;
    + struct resource *res = platform_get_resource(host->pd, IORESOURCE_MEM, 0);
    + struct dma_slave_config cfg;
    + dma_cap_mask_t mask;
    + int ret;
    +
    host->dma_active = false;

    - if (pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0)
    - if (!pdata)
    ++ if (!pdata || pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0)
    return;

    /* We can only either use DMA for both Tx and Rx or not use it at all */
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-07-22 04:21    [W:0.033 / U:2.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site