Merge branch 'topic/dw' into for-linus (3c814be9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/dma/dw/core.c

+39 −19

Original line number	Diff line number	Diff line
		@@ -1493,6 +1493,13 @@ int dw_dma_probe(struct dw_dma_chip chip, struct dw_dma_platform_data pdata)
		dw->regs = chip->regs;
		chip->dw = dw;

		dw->clk = devm_clk_get(chip->dev, "hclk");
		if (IS_ERR(dw->clk))
		return PTR_ERR(dw->clk);
		err = clk_prepare_enable(dw->clk);
		if (err)
		return err;

		dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);
		autocfg = dw_params >> DW_PARAMS_EN & 0x1;

		@@ -1500,15 +1507,19 @@ int dw_dma_probe(struct dw_dma_chip chip, struct dw_dma_platform_data pdata)

		if (!pdata && autocfg) {
		pdata = devm_kzalloc(chip->dev, sizeof(*pdata), GFP_KERNEL);
		if (!pdata)
		return -ENOMEM;
		if (!pdata) {
		err = -ENOMEM;
		goto err_pdata;
		}

		/* Fill platform data with the default values */
		pdata->is_private = true;
		pdata->chan_allocation_order = CHAN_ALLOCATION_ASCENDING;
		pdata->chan_priority = CHAN_PRIORITY_ASCENDING;
		} else if (!pdata \|\| pdata->nr_channels > DW_DMA_MAX_NR_CHANNELS)
		return -EINVAL;
		} else if (!pdata \|\| pdata->nr_channels > DW_DMA_MAX_NR_CHANNELS) {
		err = -EINVAL;
		goto err_pdata;
		}

		if (autocfg)
		nr_channels = (dw_params >> DW_PARAMS_NR_CHAN & 0x7) + 1;
		@@ -1517,13 +1528,10 @@ int dw_dma_probe(struct dw_dma_chip chip, struct dw_dma_platform_data pdata)

		dw->chan = devm_kcalloc(chip->dev, nr_channels, sizeof(*dw->chan),
		GFP_KERNEL);
		if (!dw->chan)
		return -ENOMEM;

		dw->clk = devm_clk_get(chip->dev, "hclk");
		if (IS_ERR(dw->clk))
		return PTR_ERR(dw->clk);
		clk_prepare_enable(dw->clk);
		if (!dw->chan) {
		err = -ENOMEM;
		goto err_pdata;
		}

		/* Get hardware configuration parameters */
		if (autocfg) {
		@@ -1548,21 +1556,22 @@ int dw_dma_probe(struct dw_dma_chip chip, struct dw_dma_platform_data pdata)
		/* Disable BLOCK interrupts as well */
		channel_clear_bit(dw, MASK.BLOCK, dw->all_chan_mask);

		err = devm_request_irq(chip->dev, chip->irq, dw_dma_interrupt,
		IRQF_SHARED, "dw_dmac", dw);
		if (err)
		return err;

		/* Create a pool of consistent memory blocks for hardware descriptors */
		dw->desc_pool = dmam_pool_create("dw_dmac_desc_pool", chip->dev,
		sizeof(struct dw_desc), 4, 0);
		if (!dw->desc_pool) {
		dev_err(chip->dev, "No memory for descriptors dma pool\n");
		return -ENOMEM;
		err = -ENOMEM;
		goto err_pdata;
		}

		tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);

		err = request_irq(chip->irq, dw_dma_interrupt, IRQF_SHARED,
		"dw_dmac", dw);
		if (err)
		goto err_pdata;

		INIT_LIST_HEAD(&dw->dma.channels);
		for (i = 0; i < nr_channels; i++) {
		struct dw_dma_chan *dwc = &dw->chan[i];
		@@ -1650,12 +1659,20 @@ int dw_dma_probe(struct dw_dma_chip chip, struct dw_dma_platform_data pdata)

		dma_writel(dw, CFG, DW_CFG_DMA_EN);

		err = dma_async_device_register(&dw->dma);
		if (err)
		goto err_dma_register;

		dev_info(chip->dev, "DesignWare DMA Controller, %d channels\n",
		nr_channels);

		dma_async_device_register(&dw->dma);

		return 0;

		err_dma_register:
		free_irq(chip->irq, dw);
		err_pdata:
		clk_disable_unprepare(dw->clk);
		return err;
		}
		EXPORT_SYMBOL_GPL(dw_dma_probe);

		@@ -1667,6 +1684,7 @@ int dw_dma_remove(struct dw_dma_chip *chip)
		dw_dma_off(dw);
		dma_async_device_unregister(&dw->dma);

		free_irq(chip->irq, dw);
		tasklet_kill(&dw->tasklet);

		list_for_each_entry_safe(dwc, _dwc, &dw->dma.channels,
		@@ -1675,6 +1693,8 @@ int dw_dma_remove(struct dw_dma_chip *chip)
		channel_clear_bit(dw, CH_EN, dwc->mask);
		}

		clk_disable_unprepare(dw->clk);

		return 0;
		}
		EXPORT_SYMBOL_GPL(dw_dma_remove);

drivers/dma/sa11x0-dma.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -113,11 +113,9 @@ struct sa11x0_dma_phy {
		struct sa11x0_dma_desc *txd_load;
		unsigned sg_done;
		struct sa11x0_dma_desc *txd_done;
		#ifdef CONFIG_PM_SLEEP
		u32 dbs[2];
		u32 dbt[2];
		u32 dcsr;
		#endif
		};

		struct sa11x0_dma_dev {
		@@ -984,7 +982,6 @@ static int sa11x0_dma_remove(struct platform_device *pdev)
		return 0;
		}

		#ifdef CONFIG_PM_SLEEP
		static int sa11x0_dma_suspend(struct device *dev)
		{
		struct sa11x0_dma_dev *d = dev_get_drvdata(dev);
		@@ -1054,7 +1051,6 @@ static int sa11x0_dma_resume(struct device *dev)

		return 0;
		}
		#endif

		static const struct dev_pm_ops sa11x0_dma_pm_ops = {
		.suspend_noirq = sa11x0_dma_suspend,

include/linux/omap-dma.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		struct dma_chan;

		#if defined(CONFIG_DMA_OMAP) \|\| defined(CONFIG_DMA_OMAP_MODULE)
		#if defined(CONFIG_DMA_OMAP) \|\| (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
		bool omap_dma_filter_fn(struct dma_chan , void );
		#else
		static inline bool omap_dma_filter_fn(struct dma_chan c, void d)