Skip to content

Commit 4c9e94d

Browse files
committed
Merge tags 'spi-nor/for-5.11' and 'nand/for-5.11' into mtd/next
SPI NOR core changes: - Initial support for stateful Octal DTR mode using volatile settings - Preliminary support for JEDEC 251 (xSPI) and JEDEC 216D standards - Support for Cypress Semper flash - Support to specify ECC block size of SPI NOR flashes - Fixes to avoid clearing of non-volatile Block Protection bits at probe Generic NAND core: * ECC management: - Add an I/O request tweaking mechanism - Entire rework of the software BCH ECC driver, creation of a real ECC engine, getting rid of raw NAND structures, migration to more generic prototypes, misc fixes and style cleanup. Moved now to the Generic NAND layer. - Entire rework of the software Hamming ECC driver, creation of a real ECC engine, getting rid of raw NAND structures, misc renames, comment updates, cleanup, and style fixes. Moved now to the generic NAND layer. - Necessary plumbing at the NAND level to retrieve generic NAND ECC engines (softwares and on-die). - Update of the bindings. Raw NAND core: * Geting rid of the chip->ecc.priv entry. * Fix miscellaneous typos in kernel-doc Raw NAND controller drivers: * AU1550: Ensure the presence of the right includes * Davinci: Do not use extra dereferencing * GPMI: - Fix the driver only sense CS0 R/B issue - Fix the random DMA timeout issue - Use a single line for of_device_id - Use of_device_get_match_data() - Fix reference count leak in gpmi ops - Cleanup makefile - Fix binding matching of clocks on different SoCs * Ingenic: remove redundant get_device() in ingenic_ecc_get() * Intel LGM: New NAND controller driver * Marvell: Drop useless line * Meson: - Fix a resource leak in init - Fix meson_nfc_dma_buffer_release() arguments * mxc: - Use device_get_match_data() - Use a single line for of_device_id - Remove platform data support * Qcom: - Add support for SDX55 - Support for IPQ6018 QPIC NAND controller - Fix DMA sync on FLASH_STATUS register read * Rockchip: New NAND controller driver for RK3308, RK2928 and others * Sunxi: Add MDMA support SPI-NAND core: * Creation of a SPI-NAND on-die ECC engine * Move ECC related definitions earlier in the driver * Fix typo in comment * Fill a default ECC provider/algorithm * Remove outdated comment * Fix OOB read * Allow the case where there is no ECC engine * Use the external ECC engine logic SPI-NAND chip drivers: * Micron: - Add support for MT29F2G01AAAED - Use more specific names * Macronix: - Add support for MX35LFxG24AD - Add support for MX35LFxGE4AD Others: * onenand: Use mtd->oops_panic_write as condition * plat-ram: correctly free memory on error path in platram_probe()
3 parents ffad560 + 31ad3ef + ee4e0ea commit 4c9e94d

File tree

2,235 files changed

+32614
-41328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,235 files changed

+32614
-41328
lines changed

.mailmap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
8282
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
8383
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
8484
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
85-
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
85+
Dmitry Baryshkov <dbaryshkov@gmail.com>
86+
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
87+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
88+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
8689
Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
8790
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
8891
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
@@ -287,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
287290
Sarangdhar Joshi <spjoshi@codeaurora.org>
288291
Sascha Hauer <s.hauer@pengutronix.de>
289292
S.Çağlar Onur <caglar@pardus.org.tr>
293+
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
290294
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
291295
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
292296
Sebastian Reichel <sre@kernel.org> <sre@debian.org>

CREDITS

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ N: Erik Andersen
9898
E: andersen@codepoet.org
9999
W: https://www.codepoet.org/
100100
P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301 0C82 5F9B 643E 30D3 9057
101-
D: Maintainer of ide-cd and Uniform CD-ROM driver,
101+
D: Maintainer of ide-cd and Uniform CD-ROM driver,
102102
D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update.
103103
S: 352 North 525 East
104104
S: Springville, Utah 84663
@@ -263,7 +263,7 @@ N: Paul Barton-Davis
263263
E: pbd@op.net
264264
D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
265265
D: Various bugfixes and changes to sound drivers
266-
S: USA
266+
S: USA
267267

268268
N: Carlos Henrique Bauer
269269
E: chbauer@acm.org
@@ -849,6 +849,12 @@ D: trivial hack to add variable address length routing to Rose.
849849
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
850850
D: ax25-utils maintainer.
851851

852+
N: Kamil Debski
853+
E: kamil@wypas.org
854+
D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
855+
D: Samsung USB2 phy drivers
856+
D: PWM fan driver
857+
852858
N: Helge Deller
853859
E: deller@gmx.de
854860
W: http://www.parisc-linux.org/
@@ -1199,7 +1205,7 @@ N: Daniel J. Frasnelli
11991205
E: dfrasnel@alphalinux.org
12001206
W: http://www.alphalinux.org/
12011207
P: 1024/3EF87611 B9 F1 44 50 D3 E8 C2 80 DA E5 55 AA 56 7C 42 DA
1202-
D: DEC Alpha hacker
1208+
D: DEC Alpha hacker
12031209
D: Miscellaneous bug squisher
12041210

12051211
N: Jim Freeman
@@ -1299,7 +1305,7 @@ S: P.O. Box 76, Epping
12991305
S: New South Wales, 2121
13001306
S: Australia
13011307

1302-
N: Carlos E. Gorges
1308+
N: Carlos E. Gorges
13031309
E: carlos@techlinux.com.br
13041310
D: fix smp support on cmpci driver
13051311
P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB E541 17D0 0379 EA3C 4B19
@@ -1340,7 +1346,7 @@ E: wgreathouse@smva.com
13401346
E: wgreathouse@myfavoritei.com
13411347
D: Current Belkin USB Serial Adapter F5U103 hacker
13421348
D: Kernel hacker, embedded systems
1343-
S: 7802 Fitzwater Road
1349+
S: 7802 Fitzwater Road
13441350
S: Brecksville, OH 44141-1334
13451351
S: USA
13461352

@@ -1381,7 +1387,7 @@ N: Grant Guenther
13811387
E: grant@torque.net
13821388
W: http://www.torque.net/linux-pp.html
13831389
D: original author of ppa driver for parallel port ZIP drive
1384-
D: original architect of the parallel-port sharing scheme
1390+
D: original architect of the parallel-port sharing scheme
13851391
D: PARIDE subsystem: drivers for parallel port IDE & ATAPI devices
13861392
S: 44 St. Joseph Street, Suite 506
13871393
S: Toronto, Ontario, M4Y 2W4
@@ -1523,7 +1529,7 @@ N: Benjamin Herrenschmidt
15231529
E: benh@kernel.crashing.org
15241530
D: Various parts of PPC/PPC64 & PowerMac
15251531
S: 312/107 Canberra Avenue
1526-
S: Griffith, ACT 2603
1532+
S: Griffith, ACT 2603
15271533
S: Australia
15281534

15291535
N: Andreas Herrmann
@@ -1825,7 +1831,7 @@ S: Hungary
18251831
N: Bernhard Kaindl
18261832
E: bkaindl@netway.at
18271833
E: edv@bartelt.via.at
1828-
D: Author of a menu based configuration tool, kmenu, which
1834+
D: Author of a menu based configuration tool, kmenu, which
18291835
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
18301836
D: digiboard driver update(modularisation work and 2.1.x upd)
18311837
S: Tallak 95
@@ -1910,6 +1916,15 @@ S: 660 Harvard Ave. #7
19101916
S: Santa Clara, CA 95051
19111917
S: USA
19121918

1919+
N: Kukjin Kim
1920+
E: kgene@kernel.org
1921+
D: Samsung S3C, S5P and Exynos ARM architectures
1922+
1923+
N: Sangbeom Kim
1924+
E: sbkim73@samsung.com
1925+
D: Samsung SoC Audio (ASoC) drivers
1926+
D: Samsung PMIC (RTC, regulators, MFD) drivers
1927+
19131928
N: Russell King
19141929
E: rmk@arm.linux.org.uk
19151930
D: Linux/arm integrator, maintainer & hacker
@@ -2007,7 +2022,7 @@ W: http://www.xos.nl/
20072022
D: IP transparent proxy support
20082023
S: X/OS Experts in Open Systems BV
20092024
S: Kruislaan 419
2010-
S: 1098 VA Amsterdam
2025+
S: 1098 VA Amsterdam
20112026
S: The Netherlands
20122027

20132028
N: Goran Koruga
@@ -2079,7 +2094,7 @@ S: Germany
20792094

20802095
N: Andrzej M. Krzysztofowicz
20812096
E: ankry@mif.pg.gda.pl
2082-
D: Some 8-bit XT disk driver and devfs hacking
2097+
D: Some 8-bit XT disk driver and devfs hacking
20832098
D: Aladdin 1533/1543(C) chipset IDE
20842099
D: PIIX chipset IDE
20852100
S: ul. Matemblewska 1B/10
@@ -2454,7 +2469,7 @@ E: mge@EZ-Darmstadt.Telekom.de
24542469
D: Logical Volume Manager
24552470
S: Bartningstr. 12
24562471
S: 64289 Darmstadt
2457-
S: Germany
2472+
S: Germany
24582473

24592474
N: Mark W. McClelland
24602475
E: mmcclell@bigfoot.com
@@ -2538,7 +2553,7 @@ E: meskes@debian.org
25382553
P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03 AB AB 15 A3 AE AD 39 7D
25392554
D: Kernel hacker. PostgreSQL hacker. Software watchdog daemon.
25402555
D: Maintainer of several Debian packages
2541-
S: Th.-Heuss-Str. 61
2556+
S: Th.-Heuss-Str. 61
25422557
S: D-41812 Erkelenz
25432558
S: Germany
25442559

@@ -2776,7 +2791,7 @@ E: neuffer@goofy.zdv.uni-mainz.de
27762791
W: http://www.i-Connect.Net/~mike/
27772792
D: Developer and maintainer of the EATA-DMA SCSI driver
27782793
D: Co-developer EATA-PIO SCSI driver
2779-
D: /proc/scsi and assorted other snippets
2794+
D: /proc/scsi and assorted other snippets
27802795
S: Zum Schiersteiner Grund 2
27812796
S: 55127 Mainz
27822797
S: Germany
@@ -2843,6 +2858,10 @@ D: IPX development and support
28432858
N: Venkatesh Pallipadi (Venki)
28442859
D: x86/HPET
28452860

2861+
N: Kyungmin Park
2862+
E: kyungmin.park@samsung.com
2863+
D: Samsung S5Pv210 and Exynos4210 mobile platforms
2864+
28462865
N: David Parsons
28472866
E: orc@pell.chi.il.us
28482867
D: improved memory detection code.
@@ -3010,7 +3029,7 @@ D: Embedded PowerPC 4xx/6xx/7xx/74xx support
30103029
S: Chandler, Arizona 85249
30113030
S: USA
30123031

3013-
N: Frederic Potter
3032+
N: Frederic Potter
30143033
E: fpotter@cirpack.com
30153034
D: Some PCI kernel support
30163035

@@ -3443,21 +3462,21 @@ S: Klosterweg 28 / i309
34433462
S: 76131 Karlsruhe
34443463
S: Germany
34453464

3446-
N: James Simmons
3465+
N: James Simmons
34473466
E: jsimmons@infradead.org
3448-
E: jsimmons@users.sf.net
3467+
E: jsimmons@users.sf.net
34493468
D: Frame buffer device maintainer
34503469
D: input layer development
34513470
D: tty/console layer
3452-
D: various mipsel devices
3453-
S: 115 Carmel Avenue
3471+
D: various mipsel devices
3472+
S: 115 Carmel Avenue
34543473
S: El Cerrito CA 94530
3455-
S: USA
3474+
S: USA
34563475

34573476
N: Jaspreet Singh
34583477
E: jaspreet@sangoma.com
34593478
W: www.sangoma.com
3460-
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
3479+
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
34613480
S: Sangoma Technologies Inc.,
34623481
S: 1001 Denison Street
34633482
S: Suite 101
@@ -3481,7 +3500,7 @@ N: Craig Small
34813500
E: csmall@triode.apana.org.au
34823501
E: vk2xlz@gonzo.vk2xlz.ampr.org (packet radio)
34833502
D: Gracilis PackeTwin device driver
3484-
D: RSPF daemon
3503+
D: RSPF daemon
34853504
S: 10 Stockalls Place
34863505
S: Minto, NSW, 2566
34873506
S: Australia
@@ -3691,7 +3710,7 @@ N: Tsu-Sheng Tsao
36913710
E: tsusheng@scf.usc.edu
36923711
D: IGMP(Internet Group Management Protocol) version 2
36933712
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
3694-
S: Taipei
3713+
S: Taipei
36953714
S: Taiwan 112
36963715
S: Republic of China
36973716
S: 24335 Delta Drive
@@ -3852,15 +3871,15 @@ D: Produced the Slackware distribution, updated the SVGAlib
38523871
D: patches for ghostscript, worked on color 'ls', etc.
38533872
S: 301 15th Street S.
38543873
S: Moorhead, Minnesota 56560
3855-
S: USA
3874+
S: USA
38563875

38573876
N: Jos Vos
38583877
E: jos@xos.nl
38593878
W: http://www.xos.nl/
38603879
D: Various IP firewall updates, ipfwadm
38613880
S: X/OS Experts in Open Systems BV
38623881
S: Kruislaan 419
3863-
S: 1098 VA Amsterdam
3882+
S: 1098 VA Amsterdam
38643883
S: The Netherlands
38653884

38663885
N: Jeroen Vreeken
@@ -4098,7 +4117,7 @@ S: People's Repulic of China
40984117
N: Victor Yodaiken
40994118
E: yodaiken@fsmlabs.com
41004119
D: RTLinux (RealTime Linux)
4101-
S: POB 1822
4120+
S: POB 1822
41024121
S: Socorro NM, 87801
41034122
S: USA
41044123

@@ -4196,7 +4215,7 @@ D: EISA/sysfs subsystem
41964215
S: France
41974216

41984217
# Don't add your name here, unless you really _are_ after Marc
4199-
# alphabetically. Leonard used to be very proud of being the
4218+
# alphabetically. Leonard used to be very proud of being the
42004219
# last entry, and he'll get positively pissed if he can't even
42014220
# be second-to-last. (and this file really _is_ supposed to be
42024221
# in alphabetic order)

Documentation/ABI/README

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The different levels of stability are:
3232
layout of the files below for details on how to do this.)
3333

3434
obsolete/
35-
This directory documents interfaces that are still remaining in
35+
This directory documents interfaces that are still remaining in
3636
the kernel, but are marked to be removed at some later point in
3737
time. The description of the interface will document the reason
3838
why it is obsolete and when it can be expected to be removed.
@@ -58,6 +58,14 @@ Users: All users of this interface who wish to be notified when
5858
be changed further.
5959

6060

61+
Note:
62+
The fields should be use a simple notation, compatible with ReST markup.
63+
Also, the file **should not** have a top-level index, like::
64+
65+
===
66+
foo
67+
===
68+
6169
How things move between levels:
6270

6371
Interfaces in stable may move to obsolete, as long as the proper

Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Description: Device DAX is the device-centric analogue of Filesystem
88
system. Device DAX is strict, precise and predictable.
99
Specifically this interface:
1010

11-
1/ Guarantees fault granularity with respect to a given
12-
page size (pte, pmd, or pud) set at configuration time.
11+
1. Guarantees fault granularity with respect to a given
12+
page size (pte, pmd, or pud) set at configuration time.
1313

14-
2/ Enforces deterministic behavior by being strict about
15-
what fault scenarios are supported.
14+
2. Enforces deterministic behavior by being strict about
15+
what fault scenarios are supported.
1616

1717
The /sys/class/dax/ interface enumerates all the
1818
device-dax instances in the system. The ABI is

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ Description: It is possible to switch the cpi setting of the mouse with the
77
setting reported by the mouse. This number has to be further
88
processed to receive the real dpi value:
99

10+
===== ====
1011
VALUE DPI
12+
===== ====
1113
1 400
1214
2 800
1315
4 1600
16+
===== ====
1417

1518
This file is readonly.
1619
Has never been used. If bookkeeping is done, it's done in userland tools.

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Description:
1313
GPIOs are identified as they are inside the kernel, using integers in
1414
the range 0..INT_MAX. See Documentation/admin-guide/gpio for more information.
1515

16+
::
17+
1618
/sys/class/gpio
1719
/export ... asks the kernel to export a GPIO to userspace
1820
/unexport ... to return a GPIO to the kernel

Documentation/ABI/removed/devfs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Description:
55
devfs has been unmaintained for a number of years, has unfixable
66
races, contains a naming policy within the kernel that is
77
against the LSB, and can be replaced by using udev.
8+
89
The files fs/devfs/*, include/linux/devfs_fs*.h were removed,
910
along with the assorted devfs function calls throughout the
1011
kernel tree.

Documentation/ABI/removed/raw1394

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Description:
77
to implement sensible device security policies, and its low level
88
of abstraction that required userspace clients to duplicate much
99
of the kernel's ieee1394 core functionality.
10+
1011
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
1112
firewire-core.
1213

Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Description: This file was deprecated because there no longer was a way to
1010
claim just control over a single rfkill instance.
1111
This file was scheduled to be removed in 2012, and was removed
1212
in 2016.
13-
Values: 0: Kernel handles events
13+
Values: 0: Kernel handles events

Documentation/ABI/removed/video1394

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Description:
88
performance issues in its first generation. Any video1394 user had
99
to use raw1394 + libraw1394 too because video1394 did not provide
1010
asynchronous I/O for device discovery and configuration.
11+
1112
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
1213
firewire-core.
1314

0 commit comments

Comments
 (0)