Skip to content

Commit 7d639ff

Browse files
author
Carlos Llamas
committed
Merge 0163c88 ("Merge tag 'mmc-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline
Steps on the way to v6.15-rc1 Resolves merge conflicts in: MAINTAINERS Cc: Paul Lawrence <paullawrence@google.com> Change-Id: I57ffe01b55ab16fd12520f6c5093b15f4c072329 Signed-off-by: Carlos Llamas <cmllamas@google.com>
2 parents 7a34c69 + 0163c88 commit 7d639ff

File tree

370 files changed

+13094
-5022
lines changed

Some content is hidden

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

370 files changed

+13094
-5022
lines changed

‎Documentation/devicetree/bindings/connector/gocontroll,moduline-module-slot.yaml

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/connector/gocontroll,moduline-module-slot.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: GOcontroll Moduline Module slot
8+
9+
maintainers:
10+
- Maud Spierings <maudspierings@gocontroll.com>
11+
12+
description:
13+
The GOcontroll Moduline module slot represents a connector that fullfills the
14+
Moduline slot specification, and can thus house any IO module that is also
15+
built to this spec.
16+
17+
properties:
18+
compatible:
19+
const: gocontroll,moduline-module-slot
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
description: indicates readiness, high means busy.
26+
maxItems: 1
27+
reset-gpios:
28+
description: resets the module, active low.
29+
maxItems: 1
30+
sync-gpios:
31+
description: sync line between all module slots.
32+
maxItems: 1
33+
34+
vdd-supply:
35+
description: low power 3v3 supply generally for the microcontroller.
36+
vddp-supply:
37+
description: medium power 5v0 supply for on module low power peripherals.
38+
vddhpp-supply:
39+
description: high power 6v-8v supply for on module high power peripherals.
40+
power-supply:
41+
description: high power 6v-30v supply for high power module circuits.
42+
43+
i2c-bus:
44+
description: i2c bus shared between module slots and the SoC
45+
$ref: /schemas/types.yaml#/definitions/phandle
46+
47+
slot-number:
48+
description:
49+
The number of the module slot representing the location of on the pcb.
50+
This enables access to the modules based on slot location.
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
53+
spi-max-frequency: true
54+
55+
required:
56+
- compatible
57+
- reg
58+
- reset-gpios
59+
- interrupts
60+
- sync-gpios
61+
- i2c-bus
62+
- slot-number
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/gpio/gpio.h>
69+
#include <dt-bindings/interrupt-controller/irq.h>
70+
71+
spi {
72+
#address-cells = <1>;
73+
#size-cells = <0>;
74+
75+
connector@0 {
76+
reg = <0>;
77+
compatible = "gocontroll,moduline-module-slot";
78+
reset-gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
79+
sync-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
80+
interrupt-parent = <&gpio4>;
81+
interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
82+
vdd-supply = <&reg_3v3_per>;
83+
vddp-supply = <&reg_5v0>;
84+
vddhpp-supply = <&reg_6v4>;
85+
i2c-bus = <&i2c2>;
86+
slot-number = <1>;
87+
};
88+
};

‎Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ properties:
4646
minimum: 12
4747
maximum: 232
4848

49+
patternProperties:
50+
"-hog(-[0-9]+)?$":
51+
type: object
52+
required:
53+
- gpio-hog
54+
4955
required:
5056
- compatible
5157
- reg

‎Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ properties:
7272
"#gpio-cells":
7373
const: 2
7474

75+
gpio-ranges:
76+
maxItems: 1
77+
7578
marvell,pwm-offset:
7679
$ref: /schemas/types.yaml#/definitions/uint32
7780
description: Offset in the register map for the pwm registers (in bytes)
@@ -96,6 +99,13 @@ properties:
9699
- const: axi
97100
minItems: 1
98101

102+
patternProperties:
103+
"^(.+-hog(-[0-9]+)?)$":
104+
type: object
105+
106+
required:
107+
- gpio-hog
108+
99109
required:
100110
- compatible
101111
- gpio-controller

‎Documentation/devicetree/bindings/gpio/gpio-vf610.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- items:
2929
- enum:
3030
- fsl,imx93-gpio
31+
- fsl,imx94-gpio
3132
- fsl,imx95-gpio
3233
- const: fsl,imx8ulp-gpio
3334

‎Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ properties:
2020
- loongson,ls2k2000-gpio1
2121
- loongson,ls2k2000-gpio2
2222
- loongson,ls3a5000-gpio
23+
- loongson,ls3a6000-gpio # Loongson-3A6000 node GPIO
2324
- loongson,ls7a-gpio
25+
- loongson,ls7a2000-gpio1 # LS7A2000 chipset GPIO
26+
- loongson,ls7a2000-gpio2 # LS7A2000 ACPI GPIO
2427
- items:
2528
- const: loongson,ls2k1000-gpio
2629
- const: loongson,ls2k-gpio

‎Documentation/devicetree/bindings/gpio/nxp,pcf8575.yaml

+37
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,43 @@ properties:
7373

7474
wakeup-source: true
7575

76+
reset-gpios:
77+
maxItems: 1
78+
description:
79+
GPIO controlling the (reset active LOW) RESET# pin.
80+
81+
The active polarity of the GPIO must translate to the low state of the
82+
RESET# pin on the IC, i.e. if a GPIO is directly routed to the RESET# pin
83+
without any inverter, GPIO_ACTIVE_LOW is expected.
84+
85+
Performing a reset makes all lines initialized to their input (pulled-up)
86+
state.
87+
88+
allOf:
89+
- if:
90+
properties:
91+
compatible:
92+
not:
93+
contains:
94+
enum:
95+
- nxp,pca9670
96+
- nxp,pca9671
97+
- nxp,pca9672
98+
- nxp,pca9673
99+
then:
100+
properties:
101+
reset-gpios: false
102+
103+
# lines-initial-states XOR reset-gpios
104+
# Performing a reset reinitializes all lines to a known state which
105+
# may not match passed lines-initial-states
106+
- if:
107+
required:
108+
- lines-initial-states
109+
then:
110+
properties:
111+
reset-gpios: false
112+
76113
patternProperties:
77114
"^(.+-hog(-[0-9]+)?)$":
78115
type: object

‎Documentation/devicetree/bindings/hwmon/adi,ad741x.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,ad741x.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,adm1275.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/adi,ltc2991.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/gpio-fan.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ properties:
2323
alarm-gpios:
2424
maxItems: 1
2525

26+
fan-supply:
27+
description: Power supply for fan
28+
2629
gpio-fan,speed-map:
2730
$ref: /schemas/types.yaml#/definitions/uint32-matrix
2831
minItems: 2

‎Documentation/devicetree/bindings/hwmon/lltc,ltc2978.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ maintainers:
1212
properties:
1313
compatible:
1414
enum:
15+
- lltc,lt7170
16+
- lltc,lt7171
1517
- lltc,ltc2972
1618
- lltc,ltc2974
1719
- lltc,ltc2975
@@ -30,6 +32,7 @@ properties:
3032
- lltc,ltc7880
3133
- lltc,ltm2987
3234
- lltc,ltm4664
35+
- lltc,ltm4673
3336
- lltc,ltm4675
3437
- lltc,ltm4676
3538
- lltc,ltm4677
@@ -46,6 +49,7 @@ properties:
4649
description: |
4750
list of regulators provided by this controller.
4851
Valid names of regulators depend on number of supplies supported per device:
52+
* lt7170, lt7171 : vout0
4953
* ltc2972 vout0 - vout1
5054
* ltc2974, ltc2975 : vout0 - vout3
5155
* ltc2977, ltc2979, ltc2980, ltm2987 : vout0 - vout7
@@ -55,6 +59,7 @@ properties:
5559
* ltc7880 : vout0 - vout1
5660
* ltc3883 : vout0
5761
* ltm4664 : vout0 - vout1
62+
* ltm4673 : vout0 - vout3
5863
* ltm4675, ltm4676, ltm4677, ltm4678 : vout0 - vout1
5964
* ltm4680, ltm4686 : vout0 - vout1
6065
* ltm4700 : vout0 - vout1

‎Documentation/devicetree/bindings/hwmon/maxim,max20730.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max20730.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max6639.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
54
$id: http://devicetree.org/schemas/hwmon/maxim,max6650.yaml#
65
$schema: http://devicetree.org/meta-schemas/core.yaml#
76

‎Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/microchip,emc2305.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip EMC2305 SMBus compliant PWM fan controller
8+
9+
maintainers:
10+
- Michael Shych <michaelsh@nvidia.com>
11+
12+
description:
13+
Microchip EMC2301/2/3/5 pwm controller which supports up to five programmable
14+
fan control circuits.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- microchip,emc2305
21+
- items:
22+
- enum:
23+
- microchip,emc2303
24+
- microchip,emc2302
25+
- microchip,emc2301
26+
- const: microchip,emc2305
27+
28+
reg:
29+
maxItems: 1
30+
31+
'#address-cells':
32+
const: 1
33+
34+
'#size-cells':
35+
const: 0
36+
37+
'#pwm-cells':
38+
const: 3
39+
description: |
40+
Number of cells in a PWM specifier.
41+
- cell 0: The PWM frequency
42+
- cell 1: The PWM polarity: 0 or PWM_POLARITY_INVERTED
43+
- cell 2: The PWM output config:
44+
- 0 (Open-Drain)
45+
- 1 (Push-Pull)
46+
47+
patternProperties:
48+
'^fan@[0-4]$':
49+
$ref: fan-common.yaml#
50+
unevaluatedProperties: false
51+
properties:
52+
reg:
53+
description:
54+
The fan number used to determine the associated PWM channel.
55+
maxItems: 1
56+
57+
required:
58+
- reg
59+
60+
required:
61+
- compatible
62+
- reg
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/pwm/pwm.h>
69+
i2c {
70+
#address-cells = <1>;
71+
#size-cells = <0>;
72+
73+
fan_controller: fan-controller@2f {
74+
compatible = "microchip,emc2305";
75+
reg = <0x2f>;
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
#pwm-cells = <3>;
79+
80+
fan@0 {
81+
reg = <0x0>;
82+
pwms = <&fan_controller 26000 PWM_POLARITY_INVERTED 1>;
83+
#cooling-cells = <2>;
84+
};
85+
86+
fan@1 {
87+
reg = <0x1>;
88+
pwms = <&fan_controller 26000 0 1>;
89+
#cooling-cells = <2>;
90+
};
91+
92+
fan@2 {
93+
reg = <0x2>;
94+
pwms = <&fan_controller 26000 0 1>;
95+
#cooling-cells = <2>;
96+
};
97+
98+
fan@3 {
99+
reg = <0x3>;
100+
pwms = <&fan_controller 26000 0 1>;
101+
#cooling-cells = <2>;
102+
};
103+
104+
fan@4 {
105+
reg = <0x4>;
106+
pwms = <&fan_controller 26000 0 1>;
107+
#cooling-cells = <2>;
108+
};
109+
};
110+
};
111+
...

0 commit comments

Comments
 (0)