Commit 38e4fb66 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: Register ACPI DMA controller for PCI that has companion 



If PCI enumerated controller has a companion device,
register it in the ACPI DMA controllers as well.

Fixes: f7c799e9 ("dmaengine: dw: we do support Merrifield SoC in PCI mode")
Depends-on: b685fe26 ("dmaengine: dw: platform: Split ACPI helpers to separate module")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200526182416.52805-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 432e8130

drivers/dma/dw/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_DW_DMAC_CORE)	+= dw_dmac_core.o

dw_dmac_core-objs	:= core.o dw.o idma32.o

dw_dmac_core-$(CONFIG_ACPI)	+= acpi.o



obj-$(CONFIG_DW_DMAC)		+= dw_dmac.o

dw_dmac-y			:= platform.o

dw_dmac-$(CONFIG_ACPI)		+= acpi.o

dw_dmac-$(CONFIG_OF)		+= of.o



obj-$(CONFIG_DW_DMAC_PCI)	+= dw_dmac_pci.o

drivers/dma/dw/acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ void dw_dma_acpi_controller_register(struct dw_dma *dw) 
	if (ret)

		dev_err(dev, "could not register acpi_dma_controller\n");

}

EXPORT_SYMBOL_GPL(dw_dma_acpi_controller_register);



void dw_dma_acpi_controller_free(struct dw_dma *dw)

{
@@ -51,3 +52,4 @@ void dw_dma_acpi_controller_free(struct dw_dma *dw) 


	acpi_dma_controller_free(dev);

}

EXPORT_SYMBOL_GPL(dw_dma_acpi_controller_free);

drivers/dma/dw/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) 
	if (ret)

		return ret;



	dw_dma_acpi_controller_register(chip->dw);



	pci_set_drvdata(pdev, data);



	return 0;
@@ -71,6 +73,8 @@ static void dw_pci_remove(struct pci_dev *pdev) 
	struct dw_dma_chip *chip = data->chip;

	int ret;



	dw_dma_acpi_controller_free(chip->dw);



	ret = data->remove(chip);

	if (ret)

		dev_warn(&pdev->dev, "can't remove device properly: %d\n", ret);