Skip to content

Commit 9c214af

Browse files
committed
regmap: Merge up fixes from mainline
There's several things here that will really help my CI.
2 parents e02a4cc + 6eaae19 commit 9c214af

File tree

620 files changed

+6593
-3821
lines changed

Some content is hidden

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

620 files changed

+6593
-3821
lines changed

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,13 @@ Jisheng Zhang <[email protected]> <[email protected]>
241241
242242
243243
244+
244245
245246
John Paul Adrian Glaubitz <[email protected]>
246247
John Stultz <[email protected]>
247248
248249
250+
249251
250252
251253
@@ -453,6 +455,8 @@ Sebastian Reichel <[email protected]> <[email protected]>
453455
454456
455457
458+
459+
456460
457461
458462

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ properties:
105105
G coefficient for temperature equation.
106106
Default for series 5 = 60000
107107
Default for series 6 = 57400
108-
multipleOf: 1000
108+
multipleOf: 100
109109
minimum: 1000
110110
$ref: /schemas/types.yaml#/definitions/uint32
111111

@@ -114,7 +114,7 @@ properties:
114114
H coefficient for temperature equation.
115115
Default for series 5 = 200000
116116
Default for series 6 = 249400
117-
multipleOf: 1000
117+
multipleOf: 100
118118
minimum: 1000
119119
$ref: /schemas/types.yaml#/definitions/uint32
120120

@@ -131,7 +131,7 @@ properties:
131131
J coefficient for temperature equation.
132132
Default for series 5 = -100
133133
Default for series 6 = 0
134-
multipleOf: 1000
134+
multipleOf: 100
135135
maximum: 0
136136
$ref: /schemas/types.yaml#/definitions/int32
137137

Documentation/devicetree/bindings/serial/cavium-uart.txt

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

Documentation/devicetree/bindings/serial/nxp,lpc1850-uart.txt

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

Documentation/devicetree/bindings/sound/audio-graph-card2.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,4 @@ required:
3939

4040
additionalProperties: false
4141

42-
examples:
43-
- |
44-
sound {
45-
compatible = "audio-graph-card2";
46-
47-
links = <&cpu_port>;
48-
};
49-
50-
cpu {
51-
compatible = "cpu-driver";
52-
53-
cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; };
54-
};
55-
56-
codec {
57-
compatible = "codec-driver";
58-
59-
port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; };
60-
};
42+
...

Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Google SC7180-Trogdor ASoC sound card driver
88

99
maintainers:
10-
- Rohit kumar <[email protected]>
10+
- Rohit kumar <[email protected]>
1111
- Cheng-Yi Chiang <[email protected]>
1212

1313
description:

Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Qualcomm Technologies Inc. LPASS CPU dai driver
88

99
maintainers:
1010
- Srinivas Kandagatla <[email protected]>
11-
- Rohit kumar <[email protected]>
11+
- Rohit kumar <[email protected]>
1212

1313
description: |
1414
Qualcomm Technologies Inc. SOC Low-Power Audio SubSystem (LPASS) that consist
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/loongson,ls1x-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-1 Watchdog Timer
8+
9+
maintainers:
10+
- Keguang Zhang <[email protected]>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- loongson,ls1b-wdt
19+
- loongson,ls1c-wdt
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
- clocks
31+
32+
unevaluatedProperties: false
33+
34+
examples:
35+
- |
36+
#include <dt-bindings/clock/loongson,ls1x-clk.h>
37+
watchdog: watchdog@1fe5c060 {
38+
compatible = "loongson,ls1b-wdt";
39+
reg = <0x1fe5c060 0xc>;
40+
41+
clocks = <&clkc LS1X_CLKID_APB>;
42+
};

Documentation/process/maintainer-netdev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ If you aren't subscribed to netdev and/or are simply unsure if
9898
repository link above for any new networking-related commits. You may
9999
also check the following website for the current status:
100100

101-
http://vger.kernel.org/~davem/net-next.html
101+
https://patchwork.hopto.org/net-next.html
102102

103103
The ``net`` tree continues to collect fixes for the vX.Y content, and is
104104
fed back to Linus at regular (~weekly) intervals. Meaning that the

0 commit comments

Comments
 (0)