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: f7c799e950f9 ("dmaengine: dw: we do support Merrifield SoC in PCI mode")
Depends-on: b685fe26e9af ("dmaengine: dw: platform: Split ACPI helpers to separate module")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200526182416.52805-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/dw/Makefile b/drivers/dma/dw/Makefile
index b6f06699e91a9d6a8159d407dc1861ac59b50424..9e949f13e1b52644fb1b7daed2a32e0844479fed 100644 (file)
--- a/drivers/dma/dw/Makefile
+++ b/drivers/dma/dw/Makefile
@@ -1,10 +1,10 @@
 # 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

diff --git a/drivers/dma/dw/acpi.c b/drivers/dma/dw/acpi.c
index f6e8d55b4f6e9a007b554309b9896fc4a1e6f772..c510c109d2c3ad20eb5de6e2d4625759baa3846d 100644 (file)
--- a/drivers/dma/dw/acpi.c
+++ b/drivers/dma/dw/acpi.c
@@ -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);

diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index cf6e8ec4c0ff47c20e7420ae3c8f4f697bb32370..1142aa6f8c4accec89eacf7368c1e1e4e7b883fd 100644 (file)
--- a/drivers/dma/dw/pci.c
+++ b/drivers/dma/dw/pci.c
@@ -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);