Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20b2fc79 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

Merge tag 'spi-nor/for-4.15' of git://git.infradead.org/l2-mtd 

This pull-request contains the following notable changes:

From Cyrille:
"
Core changes:
* Introduce system power management support.
* New mechanism to select the proper .quad_enable() hook by JEDEC ID,
  when needed, instead of only by manufacturer ID.
* Add support to new memory parts from Gigadevice, Winbond, Macronix and
  Everspin.

Driver changes:
* Maintainance for Cadence, Intel, Mediatek and STM32 drivers.
"
parents 0b07194b ec0a9f62

Documentation/devicetree/bindings/mtd/cadence-quadspi.txt

+6 −1
Original line number Diff line number Diff line 
* Cadence Quad SPI controller



Required properties:

- compatible : Should be "cdns,qspi-nor".

- compatible : should be one of the following:

	Generic default - "cdns,qspi-nor".

	For TI 66AK2G SoC - "ti,k2g-qspi", "cdns,qspi-nor".

- reg : Contains two entries, each of which is a tuple consisting of a

	physical address and length. The first entry is the address and

	length of the controller register set. The second entry is the
@@ -14,6 +16,9 @@ Required properties: 


Optional properties:

- cdns,is-decoded-cs : Flag to indicate whether decoder is used or not.

- cdns,rclk-en : Flag to indicate that QSPI return clock is used to latch

  the read data rather than the QSPI clock. Make sure that QSPI return

  clock is populated on the board before using this property.



Optional subnodes:

Subnodes of the Cadence Quad SPI controller are spi slave nodes with additional

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
                 at25df321a

                 at25df641

                 at26df081a

                 mr25h128

                 mr25h256

                 mr25h10

                 mr25h40

Documentation/devicetree/bindings/mtd/mtk-quadspi.txt

+9 −6
Original line number Diff line number Diff line 
* Serial NOR flash controller for MTK MT81xx (and similar)



Required properties:

- compatible: 	  The possible values are:

		  "mediatek,mt2701-nor"

		  "mediatek,mt7623-nor"

- compatible: 	  For mt8173, compatible should be "mediatek,mt8173-nor",

		  and it's the fallback compatible for other Soc.

		  For every other SoC, should contain both the SoC-specific compatible

		  string and "mediatek,mt8173-nor".

		  The possible values are:

		  "mediatek,mt2701-nor", "mediatek,mt8173-nor"

		  "mediatek,mt2712-nor", "mediatek,mt8173-nor"

		  "mediatek,mt7622-nor", "mediatek,mt8173-nor"

		  "mediatek,mt7623-nor", "mediatek,mt8173-nor"

		  "mediatek,mt8173-nor"

		  For mt8173, compatible should be "mediatek,mt8173-nor".

		  For every other SoC, should contain both the SoC-specific compatible string

		  and "mediatek,mt8173-nor".

- reg: 		  physical base address and length of the controller's register

- clocks: 	  the phandle of the clocks needed by the nor controller

- clock-names: 	  the names of the clocks

drivers/mtd/devices/m25p80.c

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ static const struct spi_device_id m25p_ids[] = { 
	{"m25p32-nonjedec"},	{"m25p64-nonjedec"},	{"m25p128-nonjedec"},



	/* Everspin MRAMs (non-JEDEC) */

	{ "mr25h128" }, /* 128 Kib, 40 MHz */

	{ "mr25h256" }, /* 256 Kib, 40 MHz */

	{ "mr25h10" },  /*   1 Mib, 40 MHz */

	{ "mr25h40" },  /*   4 Mib, 40 MHz */

drivers/mtd/spi-nor/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config SPI_ATMEL_QUADSPI 


config SPI_CADENCE_QUADSPI

	tristate "Cadence Quad SPI controller"

	depends on OF && (ARM || COMPILE_TEST)

	depends on OF && (ARM || ARM64 || COMPILE_TEST)

	help

	  Enable support for the Cadence Quad SPI Flash controller.
@@ -90,7 +90,7 @@ config SPI_INTEL_SPI 
	tristate



config SPI_INTEL_SPI_PCI

	tristate "Intel PCH/PCU SPI flash PCI driver" if EXPERT

	tristate "Intel PCH/PCU SPI flash PCI driver"

	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" if EXPERT

	tristate "Intel PCH/PCU SPI flash platform driver"

	depends on X86

	select SPI_INTEL_SPI

	help