diff options
author | Mark Brown <broonie@kernel.org> | 2019-12-25 19:18:54 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-12-25 19:18:54 +0100 |
commit | 790514ed7715334949125de39989720dc0985f15 (patch) | |
tree | c2dd3cdabcf825170349f9f39b284dc59e11e065 /drivers/spi/spi-pxa2xx.c | |
parent | spi: tegra114: use true,false for bool variable (diff) | |
parent | spi: uniphier: Fix FIFO threshold (diff) | |
download | linux-790514ed7715334949125de39989720dc0985f15.tar.xz linux-790514ed7715334949125de39989720dc0985f15.zip |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.6
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 16b6b2ad4e7c..9071333ebdd8 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1443,6 +1443,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { { 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 }, /* APL */ { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP }, |