Commit f8d9ddbc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul

dmaengine: dw: platform: Enable iDMA 32-bit on Intel Elkhart Lake

Intel® PSE (Programmable Services Engine) provides few DMA controllers
to the host on Intel Elkhart Lake. Enable them in the ACPI glue driver.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190820131546.75744-6-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent b3757413
...@@ -173,7 +173,6 @@ static int dw_probe(struct platform_device *pdev) ...@@ -173,7 +173,6 @@ static int dw_probe(struct platform_device *pdev)
struct dw_dma_chip *chip; struct dw_dma_chip *chip;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *mem; struct resource *mem;
const struct dw_dma_platform_data *pdata;
int err; int err;
match = device_get_match_data(dev); match = device_get_match_data(dev);
...@@ -201,13 +200,14 @@ static int dw_probe(struct platform_device *pdev) ...@@ -201,13 +200,14 @@ static int dw_probe(struct platform_device *pdev)
if (err) if (err)
return err; return err;
pdata = dev_get_platdata(dev); if (!data->pdata)
if (!pdata) data->pdata = dev_get_platdata(dev);
pdata = dw_dma_parse_dt(pdev); if (!data->pdata)
data->pdata = dw_dma_parse_dt(pdev);
chip->dev = dev; chip->dev = dev;
chip->id = pdev->id; chip->id = pdev->id;
chip->pdata = pdata; chip->pdata = data->pdata;
data->chip = chip; data->chip = chip;
...@@ -298,6 +298,12 @@ static const struct acpi_device_id dw_dma_acpi_id_table[] = { ...@@ -298,6 +298,12 @@ static const struct acpi_device_id dw_dma_acpi_id_table[] = {
{ "INTL9C60", (kernel_ulong_t)&dw_dma_chip_pdata }, { "INTL9C60", (kernel_ulong_t)&dw_dma_chip_pdata },
{ "80862286", (kernel_ulong_t)&dw_dma_chip_pdata }, { "80862286", (kernel_ulong_t)&dw_dma_chip_pdata },
{ "808622C0", (kernel_ulong_t)&dw_dma_chip_pdata }, { "808622C0", (kernel_ulong_t)&dw_dma_chip_pdata },
/* Elkhart Lake iDMA 32-bit (PSE DMA) */
{ "80864BB4", (kernel_ulong_t)&idma32_chip_pdata },
{ "80864BB5", (kernel_ulong_t)&idma32_chip_pdata },
{ "80864BB6", (kernel_ulong_t)&idma32_chip_pdata },
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table); MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment