Skip to content

Commit afbf836

Browse files
committed
Add RSPI support for RZ/T2H and RZ/N2H
Merge series from Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>: Add support for RZ/T2H and RZ/N2H.
2 parents cb99656 + 0cc8cd8 commit afbf836

534 files changed

Lines changed: 6493 additions & 2645 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.

.mailmap

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
206206
David Brownell <david-b@pacbell.net>
207207
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
208208
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
209+
David Hildenbrand <david@kernel.org> <david@redhat.com>
209210
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
210211
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
211212
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -426,7 +427,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
426427
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
427428
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
428429
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
429-
Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>
430+
Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>
430431
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
431432
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
432433
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -437,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
437438
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
438439
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
439440
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
440442
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
441443
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
442444
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
@@ -605,7 +607,8 @@ Oleksij Rempel <o.rempel@pengutronix.de>
605607
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
606608
Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
607609
Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
608-
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
610+
Oliver Upton <oupton@kernel.org> <oupton@google.com>
611+
Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>
609612
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
610613
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
611614
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ patternProperties:
5050
groups:
5151
description:
5252
Name of the pin group to use for the functions.
53-
$ref: /schemas/types.yaml#/definitions/string
54-
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55-
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56-
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57-
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58-
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59-
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60-
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61-
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62-
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63-
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64-
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
53+
items:
54+
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55+
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56+
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57+
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58+
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59+
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60+
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61+
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62+
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63+
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64+
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
65+
minItems: 1
66+
maxItems: 8
6567

6668
drive-strength:
6769
enum: [2, 4, 6, 8, 16, 24, 32]

Documentation/devicetree/bindings/pinctrl/xlnx,versal-pinctrl.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ patternProperties:
7474

7575
'^conf':
7676
type: object
77+
unevaluatedProperties: false
7778
description:
7879
Pinctrl node's client devices use subnodes for pin configurations,
7980
which in turn use the standard properties below.

Documentation/devicetree/bindings/spi/renesas,rzv2h-rspi.yaml

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ title: Renesas RZ/V2H(P) Renesas Serial Peripheral Interface (RSPI)
99
maintainers:
1010
- Fabrizio Castro <fabrizio.castro.jz@renesas.com>
1111

12-
allOf:
13-
- $ref: spi-controller.yaml#
14-
1512
properties:
1613
compatible:
17-
const: renesas,r9a09g057-rspi # RZ/V2H(P)
14+
oneOf:
15+
- enum:
16+
- renesas,r9a09g057-rspi # RZ/V2H(P)
17+
- renesas,r9a09g077-rspi # RZ/T2H
18+
- items:
19+
- const: renesas,r9a09g087-rspi # RZ/N2H
20+
- const: renesas,r9a09g077-rspi # RZ/T2H
1821

1922
reg:
2023
maxItems: 1
@@ -36,13 +39,12 @@ properties:
3639
- const: tx
3740

3841
clocks:
42+
minItems: 2
3943
maxItems: 3
4044

4145
clock-names:
42-
items:
43-
- const: pclk
44-
- const: pclk_sfr
45-
- const: tclk
46+
minItems: 2
47+
maxItems: 3
4648

4749
resets:
4850
maxItems: 2
@@ -62,12 +64,52 @@ required:
6264
- interrupt-names
6365
- clocks
6466
- clock-names
65-
- resets
66-
- reset-names
6767
- power-domains
6868
- '#address-cells'
6969
- '#size-cells'
7070

71+
allOf:
72+
- $ref: spi-controller.yaml#
73+
- if:
74+
properties:
75+
compatible:
76+
contains:
77+
enum:
78+
- renesas,r9a09g057-rspi
79+
then:
80+
properties:
81+
clocks:
82+
minItems: 3
83+
84+
clock-names:
85+
items:
86+
- const: pclk
87+
- const: pclk_sfr
88+
- const: tclk
89+
90+
required:
91+
- resets
92+
- reset-names
93+
94+
- if:
95+
properties:
96+
compatible:
97+
contains:
98+
enum:
99+
- renesas,r9a09g077-rspi
100+
then:
101+
properties:
102+
clocks:
103+
maxItems: 2
104+
105+
clock-names:
106+
items:
107+
- const: pclk
108+
- const: pclkspi
109+
110+
resets: false
111+
reset-names: false
112+
71113
unevaluatedProperties: false
72114

73115
examples:

Documentation/input/event-codes.rst

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -400,19 +400,30 @@ can report through the rotational axes (absolute and/or relative rx, ry, rz).
400400
All other axes retain their meaning. A device must not mix
401401
regular directional axes and accelerometer axes on the same event node.
402402

403-
INPUT_PROP_HAPTIC_TOUCHPAD
404-
--------------------------
403+
INPUT_PROP_PRESSUREPAD
404+
----------------------
405+
406+
The INPUT_PROP_PRESSUREPAD property indicates that the device provides
407+
simulated haptic feedback (e.g. a vibrator motor situated below the surface)
408+
instead of physical haptic feedback (e.g. a hinge). This property is only set
409+
if the device:
405410

406-
The INPUT_PROP_HAPTIC_TOUCHPAD property indicates that device:
407-
- supports simple haptic auto and manual triggering
408411
- can differentiate between at least 5 fingers
409412
- uses correct resolution for the X/Y (units and value)
410-
- reports correct force per touch, and correct units for them (newtons or grams)
411413
- follows the MT protocol type B
412414

415+
If the simulated haptic feedback is controllable by userspace the device must:
416+
417+
- support simple haptic auto and manual triggering, and
418+
- report correct force per touch, and correct units for them (newtons or grams), and
419+
- provide the EV_FF FF_HAPTIC force feedback effect.
420+
413421
Summing up, such devices follow the MS spec for input devices in
414-
Win8 and Win8.1, and in addition support the Simple haptic controller HID table,
415-
and report correct units for the pressure.
422+
Win8 and Win8.1, and in addition may support the Simple haptic controller HID
423+
table, and report correct units for the pressure.
424+
425+
Where applicable, this property is set in addition to INPUT_PROP_BUTTONPAD, it
426+
does not replace that property.
416427

417428
Guidelines
418429
==========

Documentation/sound/codecs/cs35l56.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ In this example the SSID is 10280c63.
105105

106106
The format of the firmware file names is:
107107

108-
SoundWire (except CS35L56 Rev B0):
108+
SoundWire:
109109
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?
110110

111-
SoundWire CS35L56 Rev B0:
111+
SoundWire CS35L56 Rev B0 firmware released before kernel version 6.16:
112112
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN
113113

114114
Non-SoundWire (HDA and I2S):
@@ -127,9 +127,8 @@ Where:
127127
* spkidX is an optional part, used for laptops that have firmware
128128
configurations for different makes and models of internal speakers.
129129

130-
The CS35L56 Rev B0 continues to use the old filename scheme because a
131-
large number of firmware files have already been published with these
132-
names.
130+
Early firmware for CS35L56 Rev B0 used the ALSA prefix (ampN) as the
131+
filename qualifier. Support for the l?u? qualifier was added in kernel 6.16.
133132

134133
Sound Open Firmware and ALSA topology files
135134
-------------------------------------------

Documentation/userspace-api/netlink/intro-specs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Simple CLI
1313
Kernel comes with a simple CLI tool which should be useful when
1414
developing Netlink related code. The tool is implemented in Python
1515
and can use a YAML specification to issue Netlink requests
16-
to the kernel. Only Generic Netlink is supported.
16+
to the kernel.
1717

1818
The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts
19-
a handul of arguments, the most important ones are:
19+
a handful of arguments, the most important ones are:
2020

2121
- ``--spec`` - point to the spec file
2222
- ``--do $name`` / ``--dump $name`` - issue request ``$name``

Documentation/wmi/driver-development-guide.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ to matching WMI devices using a struct wmi_device_id table:
5454
::
5555

5656
static const struct wmi_device_id foo_id_table[] = {
57+
/* Only use uppercase letters! */
5758
{ "936DA01F-9ABD-4D9D-80C7-02AF85C822A8", NULL },
5859
{ }
5960
};

0 commit comments

Comments
 (0)