spi: pxa2xx: Fix the controller numbering for Wildcat Point

Wildcat Point has two SPI controllers and added one is actually second one.
Fix the numbering by adding the description of the first one.

Fixes: caba248db286 ("spi: spi-pxa2xx-pci: Add ID and driver type for WildcatPoint PCH")
Cc: Leif Liddy <leif.liddy@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210208163816.22147-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index f236e3034cf85f418bafed48e1702b4c5d1606d4..aafac128bb5f1816b092eff0a020c0b34ec9760f 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -21,7 +21,8 @@ enum {
        PORT_BSW1,
        PORT_BSW2,
        PORT_CE4100,
-       PORT_LPT,
+       PORT_LPT0,
+       PORT_LPT1,
 };
 
 struct pxa_spi_info {
@@ -57,8 +58,10 @@ static struct dw_dma_slave bsw1_rx_param = { .src_id = 7 };
 static struct dw_dma_slave bsw2_tx_param = { .dst_id = 8 };
 static struct dw_dma_slave bsw2_rx_param = { .src_id = 9 };
 
-static struct dw_dma_slave lpt_tx_param = { .dst_id = 0 };
-static struct dw_dma_slave lpt_rx_param = { .src_id = 1 };
+static struct dw_dma_slave lpt1_tx_param = { .dst_id = 0 };
+static struct dw_dma_slave lpt1_rx_param = { .src_id = 1 };
+static struct dw_dma_slave lpt0_tx_param = { .dst_id = 2 };
+static struct dw_dma_slave lpt0_rx_param = { .src_id = 3 };
 
 static bool lpss_dma_filter(struct dma_chan *chan, void *param)
 {
@@ -185,12 +188,19 @@ static struct pxa_spi_info spi_info_configs[] = {
                .num_chipselect = 1,
                .max_clk_rate = 50000000,
        },
-       [PORT_LPT] = {
+       [PORT_LPT0] = {
                .type = LPSS_LPT_SSP,
                .port_id = 0,
                .setup = lpss_spi_setup,
-               .tx_param = &lpt_tx_param,
-               .rx_param = &lpt_rx_param,
+               .tx_param = &lpt0_tx_param,
+               .rx_param = &lpt0_rx_param,
+       },
+       [PORT_LPT1] = {
+               .type = LPSS_LPT_SSP,
+               .port_id = 1,
+               .setup = lpss_spi_setup,
+               .tx_param = &lpt1_tx_param,
+               .rx_param = &lpt1_rx_param,
        },
 };
 
@@ -285,8 +295,9 @@ static const struct pci_device_id pxa2xx_spi_pci_devices[] = {
        { PCI_VDEVICE(INTEL, 0x2290), PORT_BSW1 },
        { PCI_VDEVICE(INTEL, 0x22ac), PORT_BSW2 },
        { PCI_VDEVICE(INTEL, 0x2e6a), PORT_CE4100 },
-       { PCI_VDEVICE(INTEL, 0x9ce6), PORT_LPT },
-       { },
+       { PCI_VDEVICE(INTEL, 0x9ce5), PORT_LPT0 },
+       { PCI_VDEVICE(INTEL, 0x9ce6), PORT_LPT1 },
+       { }
 };
 MODULE_DEVICE_TABLE(pci, pxa2xx_spi_pci_devices);