Skip to content

Commit e459ca0

Browse files
committed
Merge commit '9365f0de4303f82ed4c2db1c39d3de824b249d80' into HEAD
Merge v6.12-rc6 via char-misc-next to get some fixes needed for next few patches in IIO.
2 parents 56686ac + 9365f0d commit e459ca0

File tree

708 files changed

+8231
-5224
lines changed

Some content is hidden

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

708 files changed

+8231
-5224
lines changed

.mailmap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ Elliot Berman <[email protected]> <[email protected]>
199199
Enric Balletbo i Serra <[email protected]> <[email protected]>
200200
Enric Balletbo i Serra <[email protected]> <[email protected]>
201201
202-
202+
203+
203204
Evgeniy Polyakov <[email protected]>
204205
205206
@@ -282,7 +283,7 @@ Jan Glauber <[email protected]> <[email protected]>
282283
283284
284285
285-
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@tuni.fi>
286+
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@parity.io>
286287
287288
288289
@@ -306,6 +307,11 @@ Jens Axboe <[email protected]> <[email protected]>
306307
307308
Jens Osterkamp <[email protected]>
308309
310+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
311+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
312+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
313+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
314+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
309315
310316
311317

Documentation/admin-guide/pm/cpufreq.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ This governor exposes only one tunable:
425425

426426
``rate_limit_us``
427427
Minimum time (in microseconds) that has to pass between two consecutive
428-
runs of governor computations (default: 1000 times the scaling driver's
429-
transition latency).
428+
runs of governor computations (default: 1.5 times the scaling driver's
429+
transition latency or the maximum 2ms).
430430

431431
The purpose of this tunable is to reduce the scheduler context overhead
432432
of the governor which might be excessive without it.
@@ -474,17 +474,17 @@ This governor exposes the following tunables:
474474
This is how often the governor's worker routine should run, in
475475
microseconds.
476476

477-
Typically, it is set to values of the order of 10000 (10 ms). Its
478-
default value is equal to the value of ``cpuinfo_transition_latency``
479-
for each policy this governor is attached to (but since the unit here
480-
is greater by 1000, this means that the time represented by
481-
``sampling_rate`` is 1000 times greater than the transition latency by
482-
default).
477+
Typically, it is set to values of the order of 2000 (2 ms). Its
478+
default value is to add a 50% breathing room
479+
to ``cpuinfo_transition_latency`` on each policy this governor is
480+
attached to. The minimum is typically the length of two scheduler
481+
ticks.
483482

484483
If this tunable is per-policy, the following shell command sets the time
485-
represented by it to be 750 times as high as the transition latency::
484+
represented by it to be 1.5 times as high as the transition latency
485+
(the default)::
486486

487-
# echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) > ondemand/sampling_rate
487+
# echo `$(($(cat cpuinfo_transition_latency) * 3 / 2)) > ondemand/sampling_rate
488488

489489
``up_threshold``
490490
If the estimated CPU load is above this value (in percent), the governor

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ properties:
6363
- const: sleep
6464

6565
power-domains:
66+
description: |
67+
The MediaTek DPI module is typically associated with one of the
68+
following multimedia power domains:
69+
POWER_DOMAIN_DISPLAY
70+
POWER_DOMAIN_VDOSYS
71+
POWER_DOMAIN_MM
72+
The specific power domain used varies depending on the SoC design.
73+
74+
It is recommended to explicitly add the appropriate power domain
75+
property to the DPI node in the device tree.
6676
maxItems: 1
6777

6878
port:
@@ -79,20 +89,6 @@ required:
7989
- clock-names
8090
- port
8191

82-
allOf:
83-
- if:
84-
not:
85-
properties:
86-
compatible:
87-
contains:
88-
enum:
89-
- mediatek,mt6795-dpi
90-
- mediatek,mt8173-dpi
91-
- mediatek,mt8186-dpi
92-
then:
93-
properties:
94-
power-domains: false
95-
9692
additionalProperties: false
9793

9894
examples:

Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
description: A phandle and PM domain specifier as defined by bindings of
3939
the power controller specified by phandle. See
4040
Documentation/devicetree/bindings/power/power-domain.yaml for details.
41+
maxItems: 1
4142

4243
mediatek,gce-client-reg:
4344
description:
@@ -57,6 +58,9 @@ properties:
5758
clocks:
5859
items:
5960
- description: SPLIT Clock
61+
- description: Used for interfacing with the HDMI RX signal source.
62+
- description: Paired with receiving HDMI RX metadata.
63+
minItems: 1
6064

6165
required:
6266
- compatible
@@ -72,9 +76,24 @@ allOf:
7276
const: mediatek,mt8195-mdp3-split
7377

7478
then:
79+
properties:
80+
clocks:
81+
minItems: 3
82+
7583
required:
7684
- mediatek,gce-client-reg
7785

86+
- if:
87+
properties:
88+
compatible:
89+
contains:
90+
const: mediatek,mt8173-disp-split
91+
92+
then:
93+
properties:
94+
clocks:
95+
maxItems: 1
96+
7897
additionalProperties: false
7998

8099
examples:

Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ properties:
6767
A 2.5V to 3.3V supply for the external reference voltage. When omitted,
6868
the internal 2.5V reference is used.
6969

70+
refin-supply:
71+
description:
72+
A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
73+
7074
aina-supply:
7175
description:
7276
The common mode voltage supply for the AINA- pin on pseudo-differential
@@ -135,6 +139,23 @@ allOf:
135139
ainc-supply: false
136140
aind-supply: false
137141

142+
# ad7380-4 uses refin-supply as external reference.
143+
# All other chips from ad738x family use refio as optional external reference.
144+
# When refio-supply is omitted, internal reference is used.
145+
- if:
146+
properties:
147+
compatible:
148+
enum:
149+
- adi,ad7380-4
150+
then:
151+
properties:
152+
refio-supply: false
153+
required:
154+
- refin-supply
155+
else:
156+
properties:
157+
refin-supply: false
158+
138159
examples:
139160
- |
140161
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/devicetree/bindings/fuse/renesas,rcar-efuse.yaml renamed to Documentation/devicetree/bindings/nvmem/renesas,rcar-efuse.yaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/fuse/renesas,rcar-efuse.yaml#
4+
$id: http://devicetree.org/schemas/nvmem/renesas,rcar-efuse.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: R-Car E-FUSE connected to PFC
@@ -13,6 +13,9 @@ description:
1313
The E-FUSE is a type of non-volatile memory, which is accessible through the
1414
Pin Function Controller (PFC) on some R-Car Gen4 SoCs.
1515

16+
allOf:
17+
- $ref: nvmem.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
@@ -39,17 +42,27 @@ required:
3942
- power-domains
4043
- resets
4144

42-
additionalProperties: false
45+
unevaluatedProperties: false
4346

4447
examples:
4548
- |
46-
#include <dt-bindings/clock/r8a779a0-cpg-mssr.h>
47-
#include <dt-bindings/power/r8a779a0-sysc.h>
48-
49-
fuse: fuse@e6078800 {
50-
compatible = "renesas,r8a779a0-efuse";
51-
reg = <0xe6078800 0x100>;
52-
clocks = <&cpg CPG_MOD 916>;
53-
power-domains = <&sysc R8A779A0_PD_ALWAYS_ON>;
54-
resets = <&cpg 916>;
49+
#include <dt-bindings/clock/r8a779f0-cpg-mssr.h>
50+
#include <dt-bindings/power/r8a779f0-sysc.h>
51+
52+
fuse@e6078800 {
53+
compatible = "renesas,r8a779f0-efuse";
54+
reg = <0xe6078800 0x200>;
55+
clocks = <&cpg CPG_MOD 915>;
56+
power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
57+
resets = <&cpg 915>;
58+
59+
nvmem-layout {
60+
compatible = "fixed-layout";
61+
#address-cells = <1>;
62+
#size-cells = <1>;
63+
64+
calib@144 {
65+
reg = <0x144 0x08>;
66+
};
67+
};
5568
};
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/fuse/renesas,rcar-otp.yaml#
4+
$id: http://devicetree.org/schemas/nvmem/renesas,rcar-otp.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: R-Car E-FUSE connected to OTP_MEM
@@ -13,6 +13,9 @@ description:
1313
The E-FUSE is a type of non-volatile memory, which is accessible through the
1414
One-Time Programmable Memory (OTP_MEM) module on some R-Car Gen4 SoCs.
1515

16+
allOf:
17+
- $ref: nvmem.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
@@ -22,17 +25,19 @@ properties:
2225
reg:
2326
items:
2427
- description: OTP_MEM_0
25-
- description: OTP_MEM_1
28+
- description: OTP_MEM_1.
29+
The addresses of cells defined under the optional nvmem-layout
30+
subnode are relative to this register bank.
2631

2732
required:
2833
- compatible
2934
- reg
3035

31-
additionalProperties: false
36+
unevaluatedProperties: false
3237

3338
examples:
3439
- |
35-
otp: otp@e61be000 {
36-
compatible = "renesas,r8a779g0-otp";
37-
reg = <0xe61be000 0x1000>, <0xe61bf000 0x1000>;
40+
otp@e61be000 {
41+
compatible = "renesas,r8a779g0-otp";
42+
reg = <0xe61be000 0x1000>, <0xe61bf000 0x1000>;
3843
};

Documentation/devicetree/bindings/nvmem/sc27xx-efuse.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)