* [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash
@ 2019-09-04 1:15 Jethro Beekman
2019-09-05 4:55 ` Mika Westerberg
2019-10-23 21:22 ` Tudor.Ambarus
0 siblings, 2 replies; 3+ messages in thread
From: Jethro Beekman @ 2019-09-04 1:15 UTC (permalink / raw)
To: Marek Vasut, Tudor Ambarus, David Woodhouse, Brian Norris,
Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Allison Randal, Thomas Gleixner, Jethro Beekman, Enrico Weigelt,
Mika Westerberg, linux-mtd, linux-kernel
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: Jethro Beekman <jethro@fortanix.com>
---
drivers/mtd/spi-nor/intel-spi-pci.c | 5 +++++
drivers/mtd/spi-nor/intel-spi.c | 11 +++++++++++
include/linux/platform_data/intel-spi.h | 1 +
3 files changed, 17 insertions(+)
diff --git a/drivers/mtd/spi-nor/intel-spi-pci.c b/drivers/mtd/spi-nor/intel-spi-pci.c
index b83c4ab6..195a09d 100644
--- a/drivers/mtd/spi-nor/intel-spi-pci.c
+++ b/drivers/mtd/spi-nor/intel-spi-pci.c
@@ -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)
{
@@ -67,6 +71,7 @@ static const struct pci_device_id intel_spi_pci_ids[] = {
{ PCI_VDEVICE(INTEL, 0x4b24), (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);
diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c
index 195cdca..91b7851 100644
--- a/drivers/mtd/spi-nor/intel-spi.c
+++ b/drivers/mtd/spi-nor/intel-spi.c
@@ -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;
}
diff --git a/include/linux/platform_data/intel-spi.h b/include/linux/platform_data/intel-spi.h
index ebb4f33..7f53a5c 100644
--- a/include/linux/platform_data/intel-spi.h
+++ b/include/linux/platform_data/intel-spi.h
@@ -13,6 +13,7 @@ enum intel_spi_type {
INTEL_SPI_BYT = 1,
INTEL_SPI_LPT,
INTEL_SPI_BXT,
+ INTEL_SPI_CNL,
};
/**
--
2.7.4
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash
2019-09-04 1:15 [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash Jethro Beekman
@ 2019-09-05 4:55 ` Mika Westerberg
2019-10-23 21:22 ` Tudor.Ambarus
1 sibling, 0 replies; 3+ messages in thread
From: Mika Westerberg @ 2019-09-05 4:55 UTC (permalink / raw)
To: Jethro Beekman
Cc: Enrico Weigelt, Vignesh Raghavendra, Tudor Ambarus,
Richard Weinberger, linux-kernel, Marek Vasut, linux-mtd,
Miquel Raynal, Thomas Gleixner, Brian Norris, David Woodhouse,
Allison Randal
On Wed, Sep 04, 2019 at 01:15:24AM +0000, Jethro Beekman wrote:
> 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: Jethro Beekman <jethro@fortanix.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash
2019-09-04 1:15 [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash Jethro Beekman
2019-09-05 4:55 ` Mika Westerberg
@ 2019-10-23 21:22 ` Tudor.Ambarus
1 sibling, 0 replies; 3+ messages in thread
From: Tudor.Ambarus @ 2019-10-23 21:22 UTC (permalink / raw)
To: jethro, marek.vasut, dwmw2, computersforpeace, miquel.raynal,
richard, vigneshr, allison, tglx, info, mika.westerberg,
linux-mtd, linux-kernel
On 09/04/2019 04:15 AM, Jethro Beekman wrote:
> External E-Mail
>
>
> 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: Jethro Beekman <jethro@fortanix.com>
> ---
> drivers/mtd/spi-nor/intel-spi-pci.c | 5 +++++
> drivers/mtd/spi-nor/intel-spi.c | 11 +++++++++++
> include/linux/platform_data/intel-spi.h | 1 +
> 3 files changed, 17 insertions(+)
>
Applied to spi-nor/next. Thanks.
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-23 21:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 1:15 [PATCH v2 2/2] mtd: spi-nor: intel-spi: add support for Intel Cannon Lake SPI flash Jethro Beekman
2019-09-05 4:55 ` Mika Westerberg
2019-10-23 21:22 ` Tudor.Ambarus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).