Skip to content

Commit

Permalink
DMA: PL330: Add new pl330 filter for DT case.
Browse files Browse the repository at this point in the history
This patch adds a new pl330_dt_filter for DT case to filter the
required channel based on the new filter params and modifies the
old filter only for non-DT case as suggested by Arnd Bergmann.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Padmavathi Venna authored and Vinod Koul committed Feb 14, 2013
1 parent a722087 commit 34d1935
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions drivers/dma/pl330.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,11 @@ struct dma_pl330_desc {
struct dma_pl330_chan *pchan;
};

struct dma_pl330_filter_args {
struct dma_pl330_dmac *pdmac;
unsigned int chan_id;
};

static inline void _callback(struct pl330_req *r, enum pl330_op_err err)
{
if (r && r->xfer_cb)
Expand Down Expand Up @@ -2352,27 +2357,23 @@ static void dma_pl330_rqcb(void *token, enum pl330_op_err err)
tasklet_schedule(&pch->task);
}

static bool pl330_dt_filter(struct dma_chan *chan, void *param)
{
struct dma_pl330_filter_args *fargs = param;

if (chan->device != &fargs->pdmac->ddma)
return false;

return (chan->chan_id == fargs->chan_id);
}

bool pl330_filter(struct dma_chan *chan, void *param)
{
u8 *peri_id;

if (chan->device->dev->driver != &pl330_driver.drv)
return false;

#ifdef CONFIG_OF
if (chan->device->dev->of_node) {
const __be32 *prop_value;
phandle phandle;
struct device_node *node;

prop_value = ((struct property *)param)->value;
phandle = be32_to_cpup(prop_value++);
node = of_find_node_by_phandle(phandle);
return ((chan->private == node) &&
(chan->chan_id == be32_to_cpup(prop_value)));
}
#endif

peri_id = chan->private;
return *peri_id == (unsigned)param;
}
Expand Down

0 comments on commit 34d1935

Please sign in to comment.