diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
| commit | 106dbe24d4146c0804cb025e450ac7af42d72356 (patch) | |
| tree | ad196f245894a8546603f8472619f9e5b73b8265 /drivers/spi/spi-pxa2xx.c | |
| parent | 2337ff45293f36efa79247b3680223b9c9154392 (diff) | |
| parent | 8cc7720470a17558bd6f8d67df63361600e46c55 (diff) | |
| download | linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.gz linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.bz2 linux-106dbe24d4146c0804cb025e450ac7af42d72356.zip | |
Merge branch 'spi-5.3' into spi-next
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index af3f37ba82c8..fc7ab4b26880 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1437,6 +1437,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { { 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 }, /* APL */ { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP }, @@ -1704,6 +1708,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) goto out_error_dma_irq_alloc; controller->max_speed_hz = clk_get_rate(ssp->clk); + /* + * Set minimum speed for all other platforms than Intel Quark which is + * able do under 1 Hz transfers. + */ + if (!pxa25x_ssp_comp(drv_data)) + controller->min_speed_hz = + DIV_ROUND_UP(controller->max_speed_hz, 4096); + else if (!is_quark_x1000_ssp(drv_data)) + controller->min_speed_hz = + DIV_ROUND_UP(controller->max_speed_hz, 512); /* Load default SSP configuration */ pxa2xx_spi_write(drv_data, SSCR0, 0); |