spi: pxa2xx: Remove no more needed PCI ID table

Since the PCI enumerated devices provide a property with SSP type,
there is no more necessity to bear the copy of the ID table here.
Remove it for good.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20221021190018.63646-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 5527bcc..38b8af8 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/of.h>
-#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
@@ -1335,121 +1334,17 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);
 #endif
 
-/*
- * PCI IDs of compound devices that integrate both host controller and private
- * integrated DMA engine. Please note these are not used in module
- * autoloading and probing in this module but matching the LPSS SSP type.
- */
-static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
-       /* SPT-LP */
-       { PCI_VDEVICE(INTEL, 0x9d29), LPSS_SPT_SSP },
-       { PCI_VDEVICE(INTEL, 0x9d2a), LPSS_SPT_SSP },
-       /* SPT-H */
-       { PCI_VDEVICE(INTEL, 0xa129), LPSS_SPT_SSP },
-       { PCI_VDEVICE(INTEL, 0xa12a), LPSS_SPT_SSP },
-       /* KBL-H */
-       { PCI_VDEVICE(INTEL, 0xa2a9), LPSS_SPT_SSP },
-       { PCI_VDEVICE(INTEL, 0xa2aa), LPSS_SPT_SSP },
-       /* CML-V */
-       { PCI_VDEVICE(INTEL, 0xa3a9), LPSS_SPT_SSP },
-       { PCI_VDEVICE(INTEL, 0xa3aa), LPSS_SPT_SSP },
-       /* BXT A-Step */
-       { PCI_VDEVICE(INTEL, 0x0ac2), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x0ac4), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x0ac6), LPSS_BXT_SSP },
-       /* BXT B-Step */
-       { PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP },
-       /* GLK */
-       { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP },
-       /* ICL-LP */
-       { PCI_VDEVICE(INTEL, 0x34aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x34ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x34fb), LPSS_CNL_SSP },
-       /* EHL */
-       { PCI_VDEVICE(INTEL, 0x4b2a), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x4b2b), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x4b37), LPSS_BXT_SSP },
-       /* JSL */
-       { PCI_VDEVICE(INTEL, 0x4daa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x4dab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x4dfb), LPSS_CNL_SSP },
-       /* TGL-H */
-       { PCI_VDEVICE(INTEL, 0x43aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x43ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x43fb), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x43fd), LPSS_CNL_SSP },
-       /* ADL-P */
-       { PCI_VDEVICE(INTEL, 0x51aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x51ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x51fb), LPSS_CNL_SSP },
-       /* ADL-M */
-       { PCI_VDEVICE(INTEL, 0x54aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x54ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x54fb), LPSS_CNL_SSP },
-       /* APL */
-       { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },
-       { PCI_VDEVICE(INTEL, 0x5ac6), LPSS_BXT_SSP },
-       /* RPL-S */
-       { PCI_VDEVICE(INTEL, 0x7a2a), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7a2b), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7a79), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7a7b), LPSS_CNL_SSP },
-       /* ADL-S */
-       { PCI_VDEVICE(INTEL, 0x7aaa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7aab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7af9), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7afb), LPSS_CNL_SSP },
-       /* MTL-P */
-       { PCI_VDEVICE(INTEL, 0x7e27), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7e30), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x7e46), LPSS_CNL_SSP },
-       /* CNL-LP */
-       { PCI_VDEVICE(INTEL, 0x9daa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x9dab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x9dfb), LPSS_CNL_SSP },
-       /* CNL-H */
-       { PCI_VDEVICE(INTEL, 0xa32a), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa32b), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa37b), LPSS_CNL_SSP },
-       /* CML-LP */
-       { PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP },
-       /* CML-H */
-       { PCI_VDEVICE(INTEL, 0x06aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x06ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0x06fb), LPSS_CNL_SSP },
-       /* TGL-LP */
-       { PCI_VDEVICE(INTEL, 0xa0aa), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0ab), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0de), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0df), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0fb), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0fd), LPSS_CNL_SSP },
-       { PCI_VDEVICE(INTEL, 0xa0fe), LPSS_CNL_SSP },
-       { },
-};
-
 static const struct of_device_id pxa2xx_spi_of_match[] = {
        { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP },
        {},
 };
 MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);
 
-#ifdef CONFIG_PCI
-
 static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param)
 {
        return param == chan->device->dev;
 }
 
-#endif /* CONFIG_PCI */
-
 static struct pxa2xx_spi_controller *
 pxa2xx_spi_init_pdata(struct platform_device *pdev)
 {
@@ -1458,8 +1353,6 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
        struct device *parent = dev->parent;
        struct ssp_device *ssp;
        struct resource *res;
-       struct pci_dev *pcidev = dev_is_pci(parent) ? to_pci_dev(parent) : NULL;
-       const struct pci_device_id *pcidev_id = NULL;
        enum pxa_ssp_type type = SSP_UNDEFINED;
        const void *match;
        bool is_lpss_priv;
@@ -1468,14 +1361,9 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
 
        is_lpss_priv = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpss_priv");
 
-       if (pcidev)
-               pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match, pcidev);
-
        match = device_get_match_data(dev);
        if (match)
                type = (enum pxa_ssp_type)match;
-       else if (pcidev_id)
-               type = (enum pxa_ssp_type)pcidev_id->driver_data;
        else if (is_lpss_priv) {
                u32 value;
 
@@ -1502,13 +1390,12 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
 
        ssp->phys_base = res->start;
 
-#ifdef CONFIG_PCI
-       if (pcidev_id) {
+       /* Platforms with iDMA 64-bit */
+       if (is_lpss_priv) {
                pdata->tx_param = parent;
                pdata->rx_param = parent;
                pdata->dma_filter = pxa2xx_spi_idma_filter;
        }
-#endif
 
        ssp->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(ssp->clk))