diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-06-07 22:53:15 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-06-07 22:53:15 +0200 |
| commit | b771327a4530e7ff05ae173d4903cd70357bb803 (patch) | |
| tree | 656082e3099b510fac728fcb076d981f7ddbf949 /drivers/mtd/spi-nor/Kconfig | |
| parent | Merge tag 'nand/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next (diff) | |
| parent | mtd: spi-nor: Add support for EN25QH32 (diff) | |
| download | linux-b771327a4530e7ff05ae173d4903cd70357bb803.tar.xz linux-b771327a4530e7ff05ae173d4903cd70357bb803.zip | |
Merge tag 'spi-nor/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next
Core changes:
- Add support for a bunch of SPI NOR chips
- Clear EAR reg when switching to 3-byte addressing mode on Winbond
chips
SPI NOR controller driver changes:
- cadence: Add DMA support for direct mode reads
- hisi: Prefix a few functions with hisi_
- intel:
* Mark the driver as "dangerous" in Kconfig
* Fix atomic sequence handling
* Pass a 40us delay (instead of 0us) to readl_poll_timeout()
- fsl:
* fix a typo in a function name
* add support for IP variants embedded in the ls2080a and ls1080a
SoCs
- stm32: request exclusive control of the reset line
Diffstat (limited to 'drivers/mtd/spi-nor/Kconfig')
| -rw-r--r-- | drivers/mtd/spi-nor/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig index c493b8230a38..6cc9c929ff57 100644 --- a/drivers/mtd/spi-nor/Kconfig +++ b/drivers/mtd/spi-nor/Kconfig @@ -90,7 +90,7 @@ config SPI_INTEL_SPI tristate config SPI_INTEL_SPI_PCI - tristate "Intel PCH/PCU SPI flash PCI driver" + tristate "Intel PCH/PCU SPI flash PCI driver (DANGEROUS)" depends on X86 && PCI select SPI_INTEL_SPI help @@ -106,7 +106,7 @@ config SPI_INTEL_SPI_PCI will be called intel-spi-pci. config SPI_INTEL_SPI_PLATFORM - tristate "Intel PCH/PCU SPI flash platform driver" + tristate "Intel PCH/PCU SPI flash platform driver (DANGEROUS)" depends on X86 select SPI_INTEL_SPI help |