Commit 4e371d99 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

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



SPI NOR core changes:
- move vendor specific code out of the core into vendor drivers.
- unify all function and object names in the vendor modules.
- make setup() callback optional to improve readability.
- skip erase logic when the SPI_NOR_NO_ERASE flag is set at flash
  declaration.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 8f877b7e 151c6b49

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com> 
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -79,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org> 
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

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>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/ABI/testing/sysfs-class-power

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ Description: 
			auto:            Charge normally, respect thresholds

			inhibit-charge:  Do not charge while AC is attached

			force-discharge: Force discharge while AC is attached

			================ ====================================



What:		/sys/class/power_supply/<supply_name>/technology

Date:		May 2007

Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing

+3 −3
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/uart*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>
@@ -9,7 +9,7 @@ Description: Selects the RX source of the UARTx device. 
		depends on the selected file.



		e.g.

		cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1

		cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1

		[io1] io2 io3 io4 uart2 uart3 uart4 io6



		In this case, UART1 gets its input from IO1 (physical serial port 1).
@@ -17,7 +17,7 @@ Description: Selects the RX source of the UARTx device. 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/io*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>

Documentation/accounting/psi.rst

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ Triggers can be set on more than one psi metric and more than one trigger 
for the same psi metric can be specified. However for each trigger a separate

file descriptor is required to be able to poll it separately from others,

therefore for each trigger a separate open() syscall should be made even

when opening the same psi interface file.

when opening the same psi interface file. Write operations to a file descriptor

with an already existing psi trigger will fail with EBUSY.



Monitors activate only when system enters stall state for the monitored

psi metric and deactivates upon exit from the stall state. While system is

Documentation/admin-guide/gpio/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ gpio 
    gpio-aggregator

    sysfs

    gpio-mockup

    gpio-sim



.. only::  subproject and html