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

Commit 0bb44280 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 

Pull slave-dmaengine fixes from Vinod Koul:
 "Two fixes for slave-dmaengine.

  The first one is for making slave_id value correct for dw_dmac and
  the other one fixes the endieness in DT parsing"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dw_dmac: adjust slave_id accordingly to request line base
  dmaengine: dw_dma: fix endianess for DT xlate function
parents a7b436d3 bce95c63

drivers/dma/dw_dmac.c

+19 −4
Original line number Original line Diff line number Diff line
@@ -1001,6 +1001,13 @@ static inline void convert_burst(u32 *maxburst) 
		*maxburst = 0;

		*maxburst = 0;

}

}





static inline void convert_slave_id(struct dw_dma_chan *dwc)

{

	struct dw_dma *dw = to_dw_dma(dwc->chan.device);



	dwc->dma_sconfig.slave_id -= dw->request_line_base;

}



static int

static int

set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)

set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)

{

{
@@ -1015,6 +1022,7 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig) 




	convert_burst(&dwc->dma_sconfig.src_maxburst);

	convert_burst(&dwc->dma_sconfig.src_maxburst);

	convert_burst(&dwc->dma_sconfig.dst_maxburst);

	convert_burst(&dwc->dma_sconfig.dst_maxburst);

	convert_slave_id(dwc);





	return 0;

	return 0;

}

}
@@ -1276,9 +1284,9 @@ static struct dma_chan *dw_dma_xlate(struct of_phandle_args *dma_spec, 
	if (dma_spec->args_count != 3)

	if (dma_spec->args_count != 3)

		return NULL;

		return NULL;





	fargs.req = be32_to_cpup(dma_spec->args+0);

	fargs.req = dma_spec->args[0];

	fargs.src = be32_to_cpup(dma_spec->args+1);

	fargs.src = dma_spec->args[1];

	fargs.dst = be32_to_cpup(dma_spec->args+2);

	fargs.dst = dma_spec->args[2];





	if (WARN_ON(fargs.req >= DW_DMA_MAX_NR_REQUESTS ||

	if (WARN_ON(fargs.req >= DW_DMA_MAX_NR_REQUESTS ||

		    fargs.src >= dw->nr_masters ||

		    fargs.src >= dw->nr_masters ||
@@ -1628,6 +1636,7 @@ dw_dma_parse_dt(struct platform_device *pdev) 




static int dw_probe(struct platform_device *pdev)

static int dw_probe(struct platform_device *pdev)

{

{

	const struct platform_device_id *match;

	struct dw_dma_platform_data *pdata;

	struct dw_dma_platform_data *pdata;

	struct resource		*io;

	struct resource		*io;

	struct dw_dma		*dw;

	struct dw_dma		*dw;
@@ -1711,6 +1720,11 @@ static int dw_probe(struct platform_device *pdev) 
		memcpy(dw->data_width, pdata->data_width, 4);

		memcpy(dw->data_width, pdata->data_width, 4);

	}

	}





	/* Get the base request line if set */

	match = platform_get_device_id(pdev);

	if (match)

		dw->request_line_base = (unsigned int)match->driver_data;



	/* Calculate all channel mask before DMA setup */

	/* Calculate all channel mask before DMA setup */

	dw->all_chan_mask = (1 << nr_channels) - 1;

	dw->all_chan_mask = (1 << nr_channels) - 1;
@@ -1906,7 +1920,8 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table); 
#endif

#endif





static const struct platform_device_id dw_dma_ids[] = {

static const struct platform_device_id dw_dma_ids[] = {

	{ "INTL9C60", 0 },

	/* Name,	Request Line Base */

	{ "INTL9C60",	(kernel_ulong_t)16 },

	{ }

	{ }

};

};

drivers/dma/dw_dmac_regs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,7 @@ struct dw_dma { 
	/* hardware configuration */

	/* hardware configuration */

	unsigned char		nr_masters;

	unsigned char		nr_masters;

	unsigned char		data_width[4];

	unsigned char		data_width[4];

	unsigned int		request_line_base;





	struct dw_dma_chan	chan[0];

	struct dw_dma_chan	chan[0];

};

};