Skip to content

Commit 53e59b5

Browse files
committed
Add support for Rockchip RK860X regulators
Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>: This patch series introduces support for the Rockchip RK860X regulators, while also providing a few fixes and improvements to the existing fan53555 driver. RK8600/RK8601 are quite similar to the FAN53555 regulators. RK8602/RK8603 are a bit different, having a wider output voltage selection range, from 0.5 V to 1.5 V in 6.25 mV steps. They are used in the Rock 5B board to power the ARM Cortex-A76 cores and the NPU.
2 parents 60bbee7 + a27e71a commit 53e59b5

982 files changed

Lines changed: 10643 additions & 6740 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ modules.order
7878
# RPM spec file (make rpm-pkg)
7979
#
8080
/*.spec
81+
/rpmbuild/
8182

8283
#
8384
# Debian directory (make deb-pkg)

.mailmap

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
2828
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
2929
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
3030
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
31+
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3132
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3233
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3334
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
121122
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
122123
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
123124
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
124-
Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
125+
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
125126
Dmitry Baryshkov <dbaryshkov@gmail.com>
126127
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
127128
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -132,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
132133
Domen Puncer <domen@coderock.org>
133134
Douglas Gilbert <dougg@torque.net>
134135
Ed L. Cashin <ecashin@coraid.com>
136+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
137+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
135138
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136139
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137140
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -194,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
194197
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
195198
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
196199
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
200+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
197201
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
198202
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
199203
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -213,6 +217,9 @@ Jens Axboe <axboe@suse.de>
213217
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
214218
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
215219
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
220+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
221+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
222+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
216223
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
217224
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
218225
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -374,6 +381,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
374381
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
375382
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
376383
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
384+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
377385
Rajesh Shah <rajesh.shah@intel.com>
378386
Ralf Baechle <ralf@linux-mips.org>
379387
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -382,6 +390,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
382390
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
383391
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
384392
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
393+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
394+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
395+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
385396
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
386397
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
387398
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -392,6 +403,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
392403
Rudolf Marek <R.Marek@sh.cvut.cz>
393404
Rui Saraiva <rmps@joel.ist.utl.pt>
394405
Sachin P Sant <ssant@in.ibm.com>
406+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
395407
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
396408
Sam Ravnborg <sam@mars.ravnborg.org>
397409
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -432,6 +444,10 @@ Thomas Graf <tgraf@suug.ch>
432444
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
433445
Thomas Pedersen <twp@codeaurora.org>
434446
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
447+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
448+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
449+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
450+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
435451
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
436452
Tony Luck <tony.luck@intel.com>
437453
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/admin-guide/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ problems and bugs in particular.
3636

3737
reporting-issues
3838
reporting-regressions
39-
security-bugs
4039
bug-hunting
4140
bug-bisect
4241
tainted-kernels

Documentation/admin-guide/reporting-issues.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
395395
list of tracked regressions, to ensure it won't fall through the cracks.
396396

397397
What qualifies as security issue is left to your judgment. Consider reading
398-
Documentation/admin-guide/security-bugs.rst before proceeding, as it
398+
Documentation/process/security-bugs.rst before proceeding, as it
399399
provides additional details how to best handle security issues.
400400

401401
An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
12691269
the report's text to these addresses; but on top of it put a small note where
12701270
you mention that you filed it with a link to the ticket.
12711271

1272-
See Documentation/admin-guide/security-bugs.rst for more information.
1272+
See Documentation/process/security-bugs.rst for more information.
12731273

12741274

12751275
Duties after the report went out

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ properties:
7676
If "broken-flash-reset" is present then having this property does not
7777
make any difference.
7878

79+
spi-cpol: true
80+
spi-cpha: true
81+
82+
dependencies:
83+
spi-cpol: [ spi-cpha ]
84+
spi-cpha: [ spi-cpol ]
85+
7986
unevaluatedProperties: false
8087

8188
examples:

Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ $defs:
9696
2: Lower Slew rate (slower edges)
9797
3: Reserved (No adjustments)
9898
99+
bias-bus-hold: true
99100
bias-pull-down: true
100101
bias-pull-up: true
101102
bias-disable: true
103+
input-enable: true
102104
output-high: true
103105
output-low: true
104106

Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,21 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- fcs,fan53555
19-
- fcs,fan53526
20-
- silergy,syr827
21-
- silergy,syr828
22-
- tcs,tcs4525
17+
oneOf:
18+
- enum:
19+
- fcs,fan53555
20+
- fcs,fan53526
21+
- rockchip,rk8600
22+
- rockchip,rk8602
23+
- silergy,syr827
24+
- silergy,syr828
25+
- tcs,tcs4525
26+
- items:
27+
- const: rockchip,rk8601
28+
- const: rockchip,rk8600
29+
- items:
30+
- const: rockchip,rk8603
31+
- const: rockchip,rk8602
2332

2433
reg:
2534
maxItems: 1

Documentation/driver-api/vfio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ group and can access them as follows::
242242
VFIO User API
243243
-------------------------------------------------------------------------------
244244

245-
Please see include/linux/vfio.h for complete API documentation.
245+
Please see include/uapi/linux/vfio.h for complete API documentation.
246246

247247
VFIO bus driver API
248248
-------------------------------------------------------------------------------

Documentation/filesystems/vfs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ defined:
12221222
return
12231223
-ECHILD and it will be called again in ref-walk mode.
12241224

1225-
``_weak_revalidate``
1225+
``d_weak_revalidate``
12261226
called when the VFS needs to revalidate a "jumped" dentry. This
12271227
is called when a path-walk ends at dentry that was not acquired
12281228
by doing a lookup in the parent directory. This includes "/",

Documentation/firmware-guide/acpi/enumeration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ possible we decided to do following:
1919
platform devices.
2020

2121
- Devices behind real busses where there is a connector resource
22-
are represented as struct spi_device or struct i2c_device. Note
22+
are represented as struct spi_device or struct i2c_client. Note
2323
that standard UARTs are not busses so there is no struct uart_device,
2424
although some of them may be represented by struct serdev_device.
2525

0 commit comments

Comments
 (0)