Commit 691d401c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "One new device ID for an Intel SoC"

* tag 'spi-fix-v6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: intel: Add support for Oak Stream SPI serial flash
parents bfeeb4a1 e7dbfe6f

drivers/spi/spi-intel-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct pci_device_id intel_spi_pci_ids[] = { 
	{ PCI_VDEVICE(INTEL, 0x51a4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x54a4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x5794), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x5825), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7723), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info },