These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / dma / dw / platform.c

diff --git a/kernel/drivers/dma/dw/platform.c b/kernel/drivers/dma/dw/platform.c
index b2c3ae0..68a4815 100644 (file)
--- a/kernel/drivers/dma/dw/platform.c
+++ b/kernel/drivers/dma/dw/platform.c
@@ -155,6 +155,7 @@ static int dw_probe(struct platform_device *pdev)
        struct dw_dma_chip *chip;
        struct device *dev = &pdev->dev;
        struct resource *mem;
+       const struct acpi_device_id *id;
        struct dw_dma_platform_data *pdata;
        int err;
 
@@ -178,6 +179,11 @@ static int dw_probe(struct platform_device *pdev)
        pdata = dev_get_platdata(dev);
        if (!pdata)
                pdata = dw_dma_parse_dt(pdev);
+       if (!pdata && has_acpi_companion(dev)) {
+               id = acpi_match_device(dev->driver->acpi_match_table, dev);
+               if (id)
+                       pdata = (struct dw_dma_platform_data *)id->driver_data;
+       }
 
        chip->dev = dev;
 
@@ -246,8 +252,17 @@ MODULE_DEVICE_TABLE(of, dw_dma_of_id_table);
 #endif
 
 #ifdef CONFIG_ACPI
+static struct dw_dma_platform_data dw_dma_acpi_pdata = {
+       .nr_channels = 8,
+       .is_private = true,
+       .chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
+       .chan_priority = CHAN_PRIORITY_ASCENDING,
+       .block_size = 4095,
+       .nr_masters = 2,
+};
+
 static const struct acpi_device_id dw_dma_acpi_id_table[] = {
-       { "INTL9C60", 0 },
+       { "INTL9C60", (kernel_ulong_t)&dw_dma_acpi_pdata },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);