Merge tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux-2.6-microblaze.git] / drivers / spi / spi-pxa2xx.c

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 0cc7672..5e59ba0 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -618,7 +618,7 @@ static void reset_sccr1(struct driver_data *drv_data)
        pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg);
 }
 
-static void int_error_stop(struct driver_data *drv_data, const char* msg)
+static void int_error_stop(struct driver_data *drv_data, const char *msg)
 {
        /* Stop and reset SSP */
        write_SSSR_CS(drv_data, drv_data->clear_sr);
@@ -1496,6 +1496,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
        { 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 },