diff options
| author | Lu Baolu <baolu.lu@linux.intel.com> | 2022-04-18 08:49:52 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-04-28 15:32:20 +0200 |
| commit | 4a6d9dd564d0e7339fc15ecc5ce66db4ad842be2 (patch) | |
| tree | 3a0c6fca984655178ce345bbd65049fb1b7284ae /drivers/amba | |
| parent | 25f3bcfc54bcf7b0e45d140ec8bfbbf10ba11869 (diff) | |
| download | lwn-4a6d9dd564d0e7339fc15ecc5ce66db4ad842be2.tar.gz lwn-4a6d9dd564d0e7339fc15ecc5ce66db4ad842be2.zip | |
amba: Stop sharing platform_dma_configure()
Stop sharing platform_dma_configure() helper as they are about to have
their own bus dma_configure callbacks.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220418005000.897664-4-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/amba')
| -rw-r--r-- | drivers/amba/bus.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index d3bd14aaabf6..76b52bd2c2a4 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -20,6 +20,8 @@ #include <linux/platform_device.h> #include <linux/reset.h> #include <linux/of_irq.h> +#include <linux/of_device.h> +#include <linux/acpi.h> #define to_amba_driver(d) container_of(d, struct amba_driver, drv) @@ -273,6 +275,21 @@ static void amba_shutdown(struct device *dev) drv->shutdown(to_amba_device(dev)); } +static int amba_dma_configure(struct device *dev) +{ + enum dev_dma_attr attr; + int ret = 0; + + if (dev->of_node) { + ret = of_dma_configure(dev, dev->of_node, true); + } else if (has_acpi_companion(dev)) { + attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); + ret = acpi_dma_configure(dev, attr); + } + + return ret; +} + #ifdef CONFIG_PM /* * Hooks to provide runtime PM of the pclk (bus clock). It is safe to @@ -341,7 +358,7 @@ struct bus_type amba_bustype = { .probe = amba_probe, .remove = amba_remove, .shutdown = amba_shutdown, - .dma_configure = platform_dma_configure, + .dma_configure = amba_dma_configure, .pm = &amba_pm, }; EXPORT_SYMBOL_GPL(amba_bustype); |