Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a31a66 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

spi: pxa2xx: Fix the controller numbering for Wildcat Point 



[ Upstream commit 54c5d3bfb0cfb7b31259765524567871dee11615 ]

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: caba248d ("spi: spi-pxa2xx-pci: Add ID and driver type for WildcatPoint PCH")
Cc: Leif Liddy <leif.liddy@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210208163816.22147-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eb6711d1

drivers/spi/spi-pxa2xx-pci.c

+19 −8
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ enum { 
	PORT_BSW1,

	PORT_BSW2,

	PORT_CE4100,

	PORT_LPT,

	PORT_LPT0,

	PORT_LPT1,

};



struct pxa_spi_info {
@@ -55,8 +56,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)

{
@@ -182,12 +185,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,

	},

};
@@ -281,8 +291,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);