Commit 9661524b authored by Richard Weinberger's avatar Richard Weinberger
Browse files

Merge tag 'spi-nor/for-5.20' into mtd/next 

SPI NOR core changes:
- move SECT_4K_PMC flag out of the core as it's a vendor specific flag
- s/addr_width/addr_nbytes: address width means the number of IO lines
  used for the address, whereas in the code it is used as the number of
  address bytes.
- do not change nor->addr_nbytes at SFDP parsing time. At the SFDP parsing
  time we should not change members of struct spi_nor, but instead fill
  members of struct spi_nor_flash_parameters which could later on be used
  by the callers.
- track flash's internal address mode so that we can use 4B opcodes
  together with opcodes that don't have a 4B opcode correspondent.

SPI NOR manufacturer drivers changes:
- esmt: Rename "f25l32qa" flash name to "f25l32qa-2s".
- micron-st: Skip FSR reading if SPI controller does not support it to
  allow flashes that support FSR to work even when attached to such SPI
  controllers.
- spansion: Add s25hl-t/s25hs-t IDs and fixups.
parents e8166841 f8cd9f63

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
# Please keep this list dictionary sorted.

#

Aaron Durbin <adurbin@google.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>

Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>
@@ -85,6 +87,7 @@ Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com> 
Christian Brauner <brauner@kernel.org> <christian@brauner.io>

Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>

Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
@@ -165,6 +168,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com> 
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Documentation/ABI/testing/sysfs-ata

+6 −5
Original line number Diff line number Diff line
@@ -107,13 +107,14 @@ Description: 
				described in ATA8 7.16 and 7.17. Only valid if

				the device is not a PM.



		pio_mode:	(RO) Transfer modes supported by the device when

				in PIO mode. Mostly used by PATA device.

		pio_mode:	(RO) PIO transfer mode used by the device.

				Mostly used by PATA devices.



		xfer_mode:	(RO) Current transfer mode

		xfer_mode:	(RO) Current transfer mode. Mostly used by

				PATA devices.



		dma_mode:	(RO) Transfer modes supported by the device when

				in DMA mode. Mostly used by PATA device.

		dma_mode:	(RO) DMA transfer mode used by the device.

				Mostly used by PATA devices.



		class:		(RO) Device class. Can be "ata" for disk,

				"atapi" for packet device, "pmp" for PM, or

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/srbds

		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities

Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ Description: Read/write the current state of DDR Backup Mode, which controls 
		     DDR Backup Mode must be explicitly enabled by the user,

		     to invoke step 1.



		See also Documentation/devicetree/bindings/mfd/bd9571mwv.txt.

		See also Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml.

Users:		User space applications for embedded boards equipped with a

		BD9571MWV PMIC.