Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e6c1db3 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/ti' into for-linus

parents d2045ba3 288e7560

drivers/dma/edma.c

+5 −0
Original line number Diff line number Diff line
@@ -891,6 +891,10 @@ static int edma_slave_config(struct dma_chan *chan, 
	    cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)

		return -EINVAL;



	if (cfg->src_maxburst > chan->device->max_burst ||

	    cfg->dst_maxburst > chan->device->max_burst)

		return -EINVAL;



	memcpy(&echan->cfg, cfg, sizeof(echan->cfg));



	return 0;
@@ -1855,6 +1859,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) 
	s_ddev->dst_addr_widths = EDMA_DMA_BUSWIDTHS;

	s_ddev->directions |= (BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV));

	s_ddev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	s_ddev->max_burst = SZ_32K - 1; /* CIDX: 16bit signed */



	s_ddev->dev = ecc->dev;

	INIT_LIST_HEAD(&s_ddev->channels);

drivers/dma/omap-dma.c

+5 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,10 @@ static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config 
	    cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)

		return -EINVAL;



	if (cfg->src_maxburst > chan->device->max_burst ||

	    cfg->dst_maxburst > chan->device->max_burst)

		return -EINVAL;



	memcpy(&c->cfg, cfg, sizeof(c->cfg));



	return 0;
@@ -1482,6 +1486,7 @@ static int omap_dma_probe(struct platform_device *pdev) 
	od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS;

	od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */

	od->ddev.dev = &pdev->dev;

	INIT_LIST_HEAD(&od->ddev.channels);

	spin_lock_init(&od->lock);

drivers/dma/ti-dma-crossbar.c

+4 −4
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ struct ti_am335x_xbar_data { 


struct ti_am335x_xbar_map {

	u16 dma_line;

	u16 mux_val;

	u8 mux_val;

};



static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u16 val)

static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u8 val)

{

	writeb_relaxed(val & 0x1f, iomem + event);

	writeb_relaxed(val, iomem + event);

}



static void ti_am335x_xbar_free(struct device *dev, void *route_data)
@@ -105,7 +105,7 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec, 
	}



	map->dma_line = (u16)dma_spec->args[0];

	map->mux_val = (u16)dma_spec->args[2];

	map->mux_val = (u8)dma_spec->args[2];



	dma_spec->args[2] = 0;

	dma_spec->args_count = 2;