linux-next: manual merge of the driver-core tree with the slave-dmatree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/dma/dw_dmac.c between commit c4cabfced23f ("dmaengine: dw_dmac:
Enhance device tree support") from the slave-dma tree and commit
463a1f8b3cee ("dma: remove use of __devinit") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/dma/dw_dmac.c
index 2c8096d,8f0b111..0000000
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -1500,92 -1462,7 +1500,92 @@@ static void dw_dma_off(struct dw_dma *d
  		dw->chan[i].initialized = false;
  }
  
 +#ifdef CONFIG_OF
 +static struct dw_dma_platform_data *
 +__devinit dw_dma_parse_dt(struct platform_device *pdev)
 +{
 +	struct device_node *sn, *cn, *np = pdev->dev.of_node;
 +	struct dw_dma_platform_data *pdata;
 +	struct dw_dma_slave *sd;
 +	u32 tmp, arr[4];
 +
 +	if (!np) {
 +		dev_err(&pdev->dev, "Missing DT data\n");
 +		return NULL;
 +	}
 +
 +	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
 +	if (!pdata)
 +		return NULL;
 +
 +	if (of_property_read_u32(np, "nr_channels", &pdata->nr_channels))
 +		return NULL;
 +
 +	if (of_property_read_bool(np, "is_private"))
 +		pdata->is_private = true;
 +
 +	if (!of_property_read_u32(np, "chan_allocation_order", &tmp))
 +		pdata->chan_allocation_order = (unsigned char)tmp;
 +
 +	if (!of_property_read_u32(np, "chan_priority", &tmp))
 +		pdata->chan_priority = tmp;
 +
 +	if (!of_property_read_u32(np, "block_size", &tmp))
 +		pdata->block_size = tmp;
 +
 +	if (!of_property_read_u32(np, "nr_masters", &tmp)) {
 +		if (tmp > 4)
 +			return NULL;
 +
 +		pdata->nr_masters = tmp;
 +	}
 +
 +	if (!of_property_read_u32_array(np, "data_width", arr,
 +				pdata->nr_masters))
 +		for (tmp = 0; tmp < pdata->nr_masters; tmp++)
 +			pdata->data_width[tmp] = arr[tmp];
 +
 +	/* parse slave data */
 +	sn = of_find_node_by_name(np, "slave_info");
 +	if (!sn)
 +		return pdata;
 +
 +	/* calculate number of slaves */
 +	tmp = of_get_child_count(sn);
 +	if (!tmp)
 +		return NULL;
 +
 +	sd = devm_kzalloc(&pdev->dev, sizeof(*sd) * tmp, GFP_KERNEL);
 +	if (!sd)
 +		return NULL;
 +
 +	pdata->sd = sd;
 +	pdata->sd_count = tmp;
 +
 +	for_each_child_of_node(sn, cn) {
 +		sd->dma_dev = &pdev->dev;
 +		of_property_read_string(cn, "bus_id", &sd->bus_id);
 +		of_property_read_u32(cn, "cfg_hi", &sd->cfg_hi);
 +		of_property_read_u32(cn, "cfg_lo", &sd->cfg_lo);
 +		if (!of_property_read_u32(cn, "src_master", &tmp))
 +			sd->src_master = tmp;
 +
 +		if (!of_property_read_u32(cn, "dst_master", &tmp))
 +			sd->dst_master = tmp;
 +		sd++;
 +	}
 +
 +	return pdata;
 +}
 +#else
 +static inline struct dw_dma_platform_data *
 +dw_dma_parse_dt(struct platform_device *pdev)
 +{
 +	return NULL;
 +}
 +#endif
 +
- static int __devinit dw_probe(struct platform_device *pdev)
+ static int dw_probe(struct platform_device *pdev)
  {
  	struct dw_dma_platform_data *pdata;
  	struct resource		*io;

Attachment: pgp00000.pgp
Description: PGP signature