Skip to content

Commit

Permalink
Merge branch 'topic/ti' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Vinod Koul committed Jan 31, 2018
2 parents 21359a8 + d087f15 commit db90305
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/dma/ti-dma-crossbar.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,15 @@ struct ti_am335x_xbar_map {

static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u8 val)
{
writeb_relaxed(val, iomem + event);
/*
* TPCC_EVT_MUX_60_63 register layout is different than the
* rest, in the sense, that event 63 is mapped to lowest byte
* and event 60 is mapped to highest, handle it separately.
*/
if (event >= 60 && event <= 63)
writeb_relaxed(val, iomem + (63 - event % 4));
else
writeb_relaxed(val, iomem + event);
}

static void ti_am335x_xbar_free(struct device *dev, void *route_data)
Expand Down

0 comments on commit db90305

Please sign in to comment.