Skip to content

Commit 909fd2b

Browse files
torvaldstorvalds
committed
Merge tag 'mfd-next-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull mfd updates from Lee Jones: - Fix race in device_node_get_regmap() using more extensive locking - Remove unused platform driver support for syscon - Allow syscon nodes to be registered without a "syscon" compatible string - Make `platform_data` pointer const in struct mfd_cell - Revert support for multiple AXP PMICs to avoid regressions - Increase SoundWire attach timeout and use gpiod_set_raw() for GPIO operation - Store the result from fault_log() for use by other sub-components - Fix an invalid regmap-config max_register value - Add another Gemini Lake ISA bridge PCI device ID - Use devm_register_power_off_handler() to simplify code - Add support for QNAP microcontroller units, including LEDs, input, and hwmon - Use MFD_CELL macros and remove unused code - Add support for AAEON UP board FPGA - Remove unused includes - Fix various typos and compatibility issues in multiple bindings - Add new bindings for rk3562 QoS, LED1202, and qcom,tcsr-ipq5424 - Convert several bindings to YAML schema - Update sprd,sc2731 bindings to reference sprd,sc2731-efuse bindings directly - Fix rohm,bd71815 bindings by correcting resistor values and typos - Documentation improvements: - Add documentation for LED1202 and qnap-mcu-hwmon - Adjust the file entry for the qnap-mcu header in MAINTAINERS * tag 'mfd-next-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (35 commits) MAINTAINERS: Adjust the file entry for the qnap-mcu header dt-bindings: mfd: syscon: Fix ti,j784s4-acspcie-proxy-ctrl compatible dt-bindings: mfd: syscon: Fix al,alpine-sysfabric-service compatible Revert "mfd: axp20x: Allow multiple regulators" dt-bindings: mfd: syscon: Add rk3562 QoS register compatible mfd: syscon: Allow syscon nodes without a "syscon" compatible mfd: syscon: Remove the platform driver support mfd: syscon: Fix race in device_node_get_regmap() dt-bindings: mfd: atmel: Convert to YAML schema dt-bindings: mfd: atmel,at91sam9260: Convert to YAML schema dt-bindings: mfd: sprd,sc2731: Reference sprd,sc2731-efuse bindings mfd: tps65219: Remove unused macros & add regmap.h mfd: tps65219: Use MFD_CELL macros leds: Add LED1202 I2C driver dt-bindings: leds: Add LED1202 LED Controller Documentation:leds: Add leds-st1202.rst mfd: Add support for AAEON UP board FPGA mfd: da9052: Store result from fault_log mfd: intel_soc_pmic_chtdc_ti: Fix invalid regmap-config max_register value mfd: cs42l43: Use devres for remove as well ...
2 parents 38f5265 + 2816b0c commit 909fd2b

Some content is hidden

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

49 files changed

+2407
-254
lines changed

‎Documentation/devicetree/bindings/leds/st,led1202.yaml‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/leds/st,led1202.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ST LED1202 LED controllers
8+
9+
maintainers:
10+
- Vicentiu Galanopulo <vicentiu.galanopulo@remote-tech.co.uk>
11+
12+
description: |
13+
The LED1202 is a 12-channel low quiescent current LED controller
14+
programmable via I2C; The output current can be adjusted separately
15+
for each channel by 8-bit analog and 12-bit digital dimming control.
16+
Datasheet available at
17+
https://www.st.com/en/power-management/led1202.html
18+
19+
properties:
20+
compatible:
21+
const: st,led1202
22+
23+
reg:
24+
maxItems: 1
25+
26+
"#address-cells":
27+
const: 1
28+
29+
"#size-cells":
30+
const: 0
31+
32+
patternProperties:
33+
"^led@[0-9a-f]$":
34+
type: object
35+
$ref: common.yaml#
36+
unevaluatedProperties: false
37+
38+
properties:
39+
reg:
40+
minimum: 0
41+
maximum: 11
42+
43+
required:
44+
- reg
45+
46+
required:
47+
- compatible
48+
- reg
49+
- "#address-cells"
50+
- "#size-cells"
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/leds/common.h>
57+
58+
i2c {
59+
#address-cells = <1>;
60+
#size-cells = <0>;
61+
62+
led-controller@58 {
63+
compatible = "st,led1202";
64+
reg = <0x58>;
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
68+
led@0 {
69+
reg = <0x0>;
70+
function = LED_FUNCTION_STATUS;
71+
color = <LED_COLOR_ID_RED>;
72+
function-enumerator = <1>;
73+
};
74+
75+
led@1 {
76+
reg = <0x1>;
77+
function = LED_FUNCTION_STATUS;
78+
color = <LED_COLOR_ID_GREEN>;
79+
function-enumerator = <2>;
80+
};
81+
82+
led@2 {
83+
reg = <0x2>;
84+
function = LED_FUNCTION_STATUS;
85+
color = <LED_COLOR_ID_BLUE>;
86+
function-enumerator = <3>;
87+
};
88+
89+
led@3 {
90+
reg = <0x3>;
91+
function = LED_FUNCTION_STATUS;
92+
color = <LED_COLOR_ID_RED>;
93+
function-enumerator = <4>;
94+
};
95+
96+
led@4 {
97+
reg = <0x4>;
98+
function = LED_FUNCTION_STATUS;
99+
color = <LED_COLOR_ID_GREEN>;
100+
function-enumerator = <5>;
101+
};
102+
103+
led@5 {
104+
reg = <0x5>;
105+
function = LED_FUNCTION_STATUS;
106+
color = <LED_COLOR_ID_BLUE>;
107+
function-enumerator = <6>;
108+
};
109+
110+
led@6 {
111+
reg = <0x6>;
112+
function = LED_FUNCTION_STATUS;
113+
color = <LED_COLOR_ID_RED>;
114+
function-enumerator = <7>;
115+
};
116+
117+
led@7 {
118+
reg = <0x7>;
119+
function = LED_FUNCTION_STATUS;
120+
color = <LED_COLOR_ID_GREEN>;
121+
function-enumerator = <8>;
122+
};
123+
124+
led@8 {
125+
reg = <0x8>;
126+
function = LED_FUNCTION_STATUS;
127+
color = <LED_COLOR_ID_BLUE>;
128+
function-enumerator = <9>;
129+
};
130+
};
131+
};
132+
...

‎Documentation/devicetree/bindings/mfd/atmel,at91sam9260-gpbr.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-gpbr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip AT91 General Purpose Backup Registers
8+
9+
maintainers:
10+
- Nicolas Ferre <nicolas.ferre@microchip.com>
11+
12+
description:
13+
The system controller embeds 256 bits of General Purpose Backup
14+
registers organized as 8 32-bit registers.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- items:
20+
- enum:
21+
- atmel,at91sam9260-gpbr
22+
- const: syscon
23+
- items:
24+
- enum:
25+
- microchip,sam9x60-gpbr
26+
- microchip,sam9x7-gpbr
27+
- const: atmel,at91sam9260-gpbr
28+
- const: syscon
29+
30+
reg:
31+
maxItems: 1
32+
33+
required:
34+
- compatible
35+
- reg
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
syscon@fffffd50 {
42+
compatible = "atmel,at91sam9260-gpbr", "syscon";
43+
reg = <0xfffffd50 0x10>;
44+
};

‎Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-matrix.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip AT91 Bus Matrix
8+
9+
maintainers:
10+
- Nicolas Ferre <nicolas.ferre@microchip.com>
11+
12+
description:
13+
The Bus Matrix (MATRIX) implements a multi-layer AHB, based on the
14+
AHB-Lite protocol, that enables parallel access paths between multiple
15+
masters and slaves in a system, thus increasing the overall bandwidth.
16+
17+
properties:
18+
compatible:
19+
oneOf:
20+
- items:
21+
- enum:
22+
- atmel,at91sam9260-matrix
23+
- atmel,at91sam9261-matrix
24+
- atmel,at91sam9263-matrix
25+
- atmel,at91sam9rl-matrix
26+
- atmel,at91sam9g45-matrix
27+
- atmel,at91sam9n12-matrix
28+
- atmel,at91sam9x5-matrix
29+
- atmel,sama5d3-matrix
30+
- const: syscon
31+
- items:
32+
- enum:
33+
- microchip,sam9x60-matrix
34+
- microchip,sam9x7-matrix
35+
- const: atmel,at91sam9x5-matrix
36+
- const: syscon
37+
38+
reg:
39+
maxItems: 1
40+
41+
required:
42+
- compatible
43+
- reg
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
syscon@ffffec00 {
50+
compatible = "atmel,sama5d3-matrix", "syscon";
51+
reg = <0xffffec00 0x200>;
52+
};

‎Documentation/devicetree/bindings/mfd/atmel-gpbr.txt‎

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

‎Documentation/devicetree/bindings/mfd/atmel-matrix.txt‎

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- qcom,tcsr-apq8064
4343
- qcom,tcsr-apq8084
4444
- qcom,tcsr-ipq5332
45+
- qcom,tcsr-ipq5424
4546
- qcom,tcsr-ipq6018
4647
- qcom,tcsr-ipq8064
4748
- qcom,tcsr-ipq8074

‎Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.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/qnap,ts433-mcu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: QNAP NAS on-board Microcontroller
8+
9+
maintainers:
10+
- Heiko Stuebner <heiko@sntech.de>
11+
12+
description:
13+
QNAP embeds a microcontroller on their NAS devices adding system feature
14+
as PWM Fan control, additional LEDs, power button status and more.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qnap,ts433-mcu
20+
21+
patternProperties:
22+
"^fan-[0-9]+$":
23+
$ref: /schemas/hwmon/fan-common.yaml#
24+
unevaluatedProperties: false
25+
26+
required:
27+
- compatible
28+
29+
additionalProperties: false
30+
31+
examples:
32+
- |
33+
uart {
34+
mcu {
35+
compatible = "qnap,ts433-mcu";
36+
37+
fan-0 {
38+
#cooling-cells = <2>;
39+
cooling-levels = <0 64 89 128 166 204 221 238>;
40+
};
41+
};
42+
};

‎Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ properties:
5050
minimum: 0
5151
maximum: 1
5252

53-
rohm,charger-sense-resistor-ohms:
54-
minimum: 10000000
55-
maximum: 50000000
53+
rohm,charger-sense-resistor-micro-ohms:
54+
minimum: 10000
55+
maximum: 50000
5656
description: |
57-
BD71827 and BD71828 have SAR ADC for measuring charging currents.
58-
External sense resistor (RSENSE in data sheet) should be used. If
59-
something other but 30MOhm resistor is used the resistance value
60-
should be given here in Ohms.
61-
default: 30000000
57+
BD71815 has SAR ADC for measuring charging currents. External sense
58+
resistor (RSENSE in data sheet) should be used. If something other
59+
but a 30 mOhm resistor is used the resistance value should be given
60+
here in micro Ohms.
61+
default: 30000
6262

6363
regulators:
6464
$ref: /schemas/regulator/rohm,bd71815-regulator.yaml
@@ -67,7 +67,7 @@ properties:
6767

6868
gpio-reserved-ranges:
6969
description: |
70-
Usage of BD71828 GPIO pins can be changed via OTP. This property can be
70+
Usage of BD71815 GPIO pins can be changed via OTP. This property can be
7171
used to mark the pins which should not be configured for GPIO. Please see
7272
the ../gpio/gpio.txt for more information.
7373
@@ -113,7 +113,7 @@ examples:
113113
gpio-controller;
114114
#gpio-cells = <2>;
115115
116-
rohm,charger-sense-resistor-ohms = <10000000>;
116+
rohm,charger-sense-resistor-micro-ohms = <10000>;
117117
118118
regulators {
119119
buck1: buck1 {

‎Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,7 @@ patternProperties:
6767

6868
"^efuse@[0-9a-f]+$":
6969
type: object
70-
additionalProperties: true
71-
properties:
72-
compatible:
73-
enum:
74-
- sprd,sc2720-efuse
75-
- sprd,sc2721-efuse
76-
- sprd,sc2723-efuse
77-
- sprd,sc2730-efuse
78-
- sprd,sc2731-efuse
70+
$ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#
7971

8072
"^fuel-gauge@[0-9a-f]+$":
8173
type: object
@@ -199,7 +191,7 @@ examples:
199191
};
200192
};
201193
202-
adc@480 {
194+
pmic_adc: adc@480 {
203195
compatible = "sprd,sc2731-adc";
204196
reg = <0x480>;
205197
interrupt-parent = <&sc2731_pmic>;

0 commit comments

Comments
 (0)