Skip to content

Commit 4aea86b

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 0471005 + 50011c3 commit 4aea86b

File tree

1,151 files changed

+105880
-132765
lines changed

Some content is hidden

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

1,151 files changed

+105880
-132765
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*.o.*
4040
*.patch
4141
*.rmeta
42+
*.rpm
4243
*.rsi
4344
*.s
4445
*.so

‎Documentation/ABI/testing/sysfs-kernel-warn_count

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/kernel/oops_count
1+
What: /sys/kernel/warn_count
22
Date: November 2022
33
KernelVersion: 6.2.0
44
Contact: Linux Kernel Hardening List <[email protected]>

‎Documentation/devicetree/bindings/leds/rohm,bd71828-leds.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: ROHM BD71828 Power Management Integrated Circuit LED driver
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
This module is part of the ROHM BD71828 MFD device. For more details

‎Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- mediatek,mt8173-gce
2222
- mediatek,mt8183-gce
2323
- mediatek,mt8186-gce
24+
- mediatek,mt8188-gce
2425
- mediatek,mt8192-gce
2526
- mediatek,mt8195-gce
2627

‎Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- qcom,sc8180x-apss-shared
2929
- qcom,sdm660-apcs-hmss-global
3030
- qcom,sdm845-apss-shared
31+
- qcom,sm4250-apcs-hmss-global
3132
- qcom,sm6125-apcs-hmss-global
3233
- qcom,sm6115-apcs-hmss-global
3334
- qcom,sm8150-apss-shared

‎Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ properties:
2424
compatible:
2525
items:
2626
- enum:
27+
- qcom,sc7280-ipcc
28+
- qcom,sc8280xp-ipcc
2729
- qcom,sm6350-ipcc
2830
- qcom,sm6375-ipcc
2931
- qcom,sm8250-ipcc
3032
- qcom,sm8350-ipcc
3133
- qcom,sm8450-ipcc
32-
- qcom,sc7280-ipcc
34+
- qcom,sm8550-ipcc
3335
- const: qcom,ipcc
3436

3537
reg:

‎Documentation/devicetree/bindings/mfd/ampere,smpro.yaml

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/mfd/ampere,smpro.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ampere Altra SMPro firmware driver
8+
9+
maintainers:
10+
- Quan Nguyen <[email protected]>
11+
12+
description: |
13+
Ampere Altra SMPro firmware may contain different blocks like hardware
14+
monitoring, error monitoring and other miscellaneous features.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- ampere,smpro
20+
21+
reg:
22+
description:
23+
I2C device address.
24+
maxItems: 1
25+
26+
required:
27+
- compatible
28+
- reg
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
i2c {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
38+
smpro@4f {
39+
compatible = "ampere,smpro";
40+
reg = <0x4f>;
41+
};
42+
};

‎Documentation/devicetree/bindings/mfd/brcm,twd.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ properties:
3636
const: 1
3737

3838
patternProperties:
39+
'^timer@[a-f0-9]+$':
40+
$ref: /schemas/timer/brcm,bcmbca-timer.yaml
41+
3942
'^watchdog@[a-f0-9]+$':
4043
$ref: /schemas/watchdog/brcm,bcm7038-wdt.yaml
4144

@@ -54,6 +57,11 @@ examples:
5457
#address-cells = <1>;
5558
#size-cells = <1>;
5659
60+
timer@0 {
61+
compatible = "brcm,bcm63138-timer";
62+
reg = <0x0 0x28>;
63+
};
64+
5765
watchdog@28 {
5866
compatible = "brcm,bcm7038-wdt";
5967
reg = <0x28 0x8>;

‎Documentation/devicetree/bindings/mfd/da9062.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ Required properties:
3333
"dlg,da9061" for DA9061
3434
- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be
3535
modified to match the chip's OTP settings).
36-
- interrupts : IRQ line information.
37-
- interrupt-controller
38-
39-
See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for
40-
further information on IRQ bindings.
4136

4237
Optional properties:
4338

@@ -48,6 +43,12 @@ Optional properties:
4843
See Documentation/devicetree/bindings/gpio/gpio.txt for further information on
4944
GPIO bindings.
5045

46+
- interrupts : IRQ line information.
47+
- interrupt-controller
48+
49+
See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for
50+
further information on IRQ bindings.
51+
5152
Sub-nodes:
5253

5354
- regulators : This node defines the settings for the LDOs and BUCKs.
@@ -85,7 +86,7 @@ Sub-nodes:
8586

8687
- onkey : See ../input/da9062-onkey.txt
8788

88-
- watchdog: See ../watchdog/da9062-watchdog.txt
89+
- watchdog: See ../watchdog/da9062-wdt.txt
8990

9091
- thermal : See ../thermal/da9062-thermal.txt
9192

‎Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ maintainers:
1212
description: |
1313
The Ocelot ethernet switch family contains chips that have an internal CPU
1414
(VSC7513, VSC7514) and chips that don't (VSC7511, VSC7512). All switches have
15-
the option to be controlled externally, which is the purpose of this driver.
15+
the option to be controlled externally via external interfaces like SPI or
16+
PCIe.
1617
1718
The switch family is a multi-port networking switch that supports many
1819
interfaces. Additionally, the device can perform pin control, MDIO buses, and
@@ -61,7 +62,6 @@ required:
6162
- reg
6263
- '#address-cells'
6364
- '#size-cells'
64-
- spi-max-frequency
6565

6666
additionalProperties: false
6767

‎Documentation/devicetree/bindings/mfd/mt6397.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Required properties:
2121
compatible:
2222
"mediatek,mt6323" for PMIC MT6323
2323
"mediatek,mt6331" for PMIC MT6331 and MT6332
24+
"mediatek,mt6357" for PMIC MT6357
2425
"mediatek,mt6358" for PMIC MT6358 and MT6366
2526
"mediatek,mt6359" for PMIC MT6359
2627
"mediatek,mt6397" for PMIC MT6397

‎Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,16 @@ properties:
9999
type: object
100100
$ref: /schemas/regulator/qcom,spmi-regulator.yaml#
101101

102+
pwm:
103+
type: object
104+
$ref: /schemas/leds/leds-qcom-lpg.yaml#
105+
102106
patternProperties:
103107
"^adc@[0-9a-f]+$":
104108
type: object
105-
$ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
109+
oneOf:
110+
- $ref: /schemas/iio/adc/qcom,spmi-iadc.yaml#
111+
- $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
106112

107113
"^adc-tm@[0-9a-f]+$":
108114
type: object
@@ -112,22 +118,20 @@ patternProperties:
112118
type: object
113119
additionalProperties: true # FIXME qcom,pm8916-wcd-analog-codec binding not converted yet
114120

115-
"extcon@[0-9a-f]+$":
121+
"^charger@[0-9a-f]+$":
116122
type: object
117-
$ref: /schemas/extcon/qcom,pm8941-misc.yaml#
123+
oneOf:
124+
- $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
125+
- $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
118126

119-
"gpio(s)?@[0-9a-f]+$":
127+
"gpio@[0-9a-f]+$":
120128
type: object
121129
$ref: /schemas/pinctrl/qcom,pmic-gpio.yaml#
122130

123131
"pon@[0-9a-f]+$":
124132
type: object
125133
$ref: /schemas/power/reset/qcom,pon.yaml#
126134

127-
"pwm@[0-9a-f]+$":
128-
type: object
129-
$ref: /schemas/leds/leds-qcom-lpg.yaml#
130-
131135
"^rtc@[0-9a-f]+$":
132136
type: object
133137
$ref: /schemas/rtc/qcom-pm8xxx-rtc.yaml#
@@ -136,9 +140,17 @@ patternProperties:
136140
type: object
137141
$ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
138142

143+
"^usb-detect@[0-9a-f]+$":
144+
type: object
145+
$ref: /schemas/extcon/qcom,pm8941-misc.yaml#
146+
147+
"^usb-vbus-regulator@[0-9a-f]+$":
148+
type: object
149+
$ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#
150+
139151
"^vibrator@[0-9a-f]+$":
140152
type: object
141-
additionalProperties: true # FIXME qcom,pm8916-vib binding not converted yet
153+
$ref: /schemas/input/qcom,pm8xxx-vib.yaml#
142154

143155
"^mpps@[0-9a-f]+$":
144156
type: object
@@ -200,7 +212,7 @@ examples:
200212
#address-cells = <1>;
201213
#size-cells = <0>;
202214
203-
pmi8998_gpio: gpios@c000 {
215+
pmi8998_gpio: gpio@c000 {
204216
compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
205217
reg = <0xc000>;
206218
gpio-controller;
@@ -285,7 +297,7 @@ examples:
285297
};
286298
};
287299
288-
pm6150_gpio: gpios@c000 {
300+
pm6150_gpio: gpio@c000 {
289301
compatible = "qcom,pm6150-gpio", "qcom,spmi-gpio";
290302
reg = <0xc000>;
291303
gpio-controller;

‎Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ properties:
1717
compatible:
1818
items:
1919
- enum:
20+
- qcom,msm8976-tcsr
2021
- qcom,msm8998-tcsr
2122
- qcom,qcs404-tcsr
2223
- qcom,sc7180-tcsr
2324
- qcom,sc7280-tcsr
25+
- qcom,sc8280xp-tcsr
2426
- qcom,sdm630-tcsr
2527
- qcom,sdm845-tcsr
2628
- qcom,sm8150-tcsr

‎Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ description: |
1515
1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,pm8018
20-
- qcom,pm8058
21-
- qcom,pm8821
22-
- qcom,pm8921
18+
oneOf:
19+
- enum:
20+
- qcom,pm8058
21+
- qcom,pm8821
22+
- qcom,pm8921
23+
- items:
24+
- enum:
25+
- qcom,pm8018
26+
- const: qcom,pm8921
2327

2428
reg:
2529
maxItems: 1
@@ -56,4 +60,23 @@ required:
5660
- interrupt-controller
5761

5862
additionalProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/interrupt-controller/irq.h>
67+
ssbi {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
pmic@0 {
71+
compatible = "qcom,pm8921";
72+
reg = <0>;
73+
#address-cells = <1>;
74+
#size-cells = <0>;
75+
interrupt-controller;
76+
#interrupt-cells = <2>;
77+
78+
interrupt-parent = <&tlmm>;
79+
interrupts = <32 IRQ_TYPE_EDGE_RISING>;
80+
};
81+
};
5982
...

‎Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.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: ROHM BD71815 Power Management Integrated Circuit
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
BD71815AGW is a single-chip power management ICs for battery-powered

‎Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.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: ROHM BD71828 Power Management Integrated Circuit
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
BD71828GW is a single-chip power management IC for battery-powered portable

‎Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.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: ROHM BD71837 Power Management Integrated Circuit
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
BD71837MWV is programmable Power Management ICs for powering single-core,

‎Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.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: ROHM BD71847 and BD71850 Power Management Integrated Circuit
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
BD71847AMWV and BD71850MWV are programmable Power Management ICs for powering

‎Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.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: ROHM BD9576MUF and BD9573MUF Power Management Integrated Circuit
88

99
maintainers:
10-
- Matti Vaittinen <[email protected].com>
10+
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
1313
BD9576MUF and BD9573MUF are power management ICs primarily intended for

‎Documentation/devicetree/bindings/mfd/syscon.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- microchip,lan966x-cpu-syscon
5454
- microchip,sparx5-cpu-syscon
5555
- mstar,msc313-pmsleep
56+
- nuvoton,wpcm450-shm
5657
- rockchip,px30-qos
5758
- rockchip,rk3036-qos
5859
- rockchip,rk3066-qos

‎Documentation/devicetree/bindings/mfd/ti,am3359-tscadc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ properties:
5252
type: object
5353
description: Magnetic reader
5454

55+
power-domains:
56+
maxItems: 1
57+
5558
required:
5659
- compatible
5760
- reg

‎Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ properties:
2626
compatible:
2727
items:
2828
- enum:
29+
- ti,j7200-system-controller
2930
- ti,j721e-system-controller
31+
- ti,j721s2-system-controller
3032
- const: syscon
3133
- const: simple-mfd
3234

0 commit comments

Comments
 (0)