Unverified Commit 4b97ba73 authored by Jethro Beekman's avatar Jethro Beekman Committed by Tudor Ambarus
Browse files

mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash 

Now that SPI flash controllers without a software sequencer are
supported, it's trivial to add support for CNL and its PCI ID.

Values from https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/300-series-chipset-pch-datasheet-vol-2.pdf



Signed-off-by: default avatarJethro Beekman <jethro@fortanix.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
parent 39129708

drivers/mtd/spi-nor/intel-spi-pci.c

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ static const struct intel_spi_boardinfo bxt_info = { 
	.type = INTEL_SPI_BXT,

};



static const struct intel_spi_boardinfo cnl_info = {

	.type = INTEL_SPI_CNL,

};



static int intel_spi_pci_probe(struct pci_dev *pdev,

			       const struct pci_device_id *id)

{
@@ -68,6 +72,7 @@ static const struct pci_device_id intel_spi_pci_ids[] = { 
	{ PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0xa1a4), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },

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

	{ },

};

MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);

drivers/mtd/spi-nor/intel-spi.c

+11 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ 
#define BXT_FREG_NUM			12

#define BXT_PR_NUM			6



#define CNL_PR				0x84

#define CNL_FREG_NUM			6

#define CNL_PR_NUM			5



#define LVSCC				0xc4

#define UVSCC				0xc8

#define ERASE_OPCODE_SHIFT		8
@@ -344,6 +348,13 @@ static int intel_spi_init(struct intel_spi *ispi) 
		ispi->erase_64k = true;

		break;



	case INTEL_SPI_CNL:

		ispi->sregs = NULL;

		ispi->pregs = ispi->base + CNL_PR;

		ispi->nregions = CNL_FREG_NUM;

		ispi->pr_num = CNL_PR_NUM;

		break;



	default:

		return -EINVAL;

	}

include/linux/platform_data/intel-spi.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ enum intel_spi_type { 
	INTEL_SPI_BYT = 1,

	INTEL_SPI_LPT,

	INTEL_SPI_BXT,

	INTEL_SPI_CNL,

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE