Skip to content

Commit 613b2a8

Browse files
committed
Merge tag 'mfd-next-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Core Framework: - Change maintainer email address - Use acpi_dev_for_each_child() helper to walk the ACPI list New Device Support: - BCM2711 RPiVid ASB in Broadcom BCM2835 - MT8195 dual-core RISC-V MCU in Chrome OS Embedded Controller - Regulator, RTC and Keys in MediaTek MT6357 PMIC - GPIO in X-Powers AXP20x PMIC - MT6331 and MT6332 in MediaTek MT6357 PMIC - Intel Meteor Lake-P PCI in Intel LPSS PCI New Functionality: - Add support for non-ACPI platforms; lpc_ich Fix-ups: - Use platform data instead of hard-coded values; bcm2835-pm - Make use of BIT/GENMASK macros; intel_soc_pmic_bxtwc - Use dev_err_probe() helper; intel_soc_pmic_chtwc, intel_soc_pmic_bxtwc - Use provided generic APIs / helpers; lpc_ich - Clean-up .remove() return values; asic3, t7l66xb, tc6387xb, tc6393xb - Use correct formatting specifiers; syscon - Replace sprintf() with sysfs_emit(); intel_soc_pmic_bxtwc - Automatically detect and fill USB endpoint pointers; dln2 - Use more appropriate dev/platform/spi resources APIs; intel_soc_pmic_bxtwc - Make use of pm_sleep_ptr(); intel_soc_pmic_chtwc, intel_soc_pmic_bxtwc - Improve error handling; intel_soc_pmic_bxtwc - Use core driver API to create groups; intel_soc_pmic_bxtwc - Kconfig fix-ups; MFD_SUN6I_PRCM - Admin: whitespace/email addresses/etc; max77714, db8500-prcmu, ipaq-micro, intel_soc_pmic_bxtwc - Remove duplicate/unused code/functionality; lpc_ich, twl-core, qcom-pm8008, intel_soc_pmic_bxtwc - DT fix-ups / conversions; da9063, ti,j721e-system-controller, st,stm32-timers, mt6397, qcom,tcsr, mps,mp2629, qcom-pm8xxx, fsl,imx8qxp-csr Bug Fixes: - Fix of_node reference leak; max77620" * tag 'mfd-next-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (49 commits) dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties' dt-bindings: mfd: st,stm32-timers: Correct 'resets' property name dt-bindings: mfd: syscon: Update Lee Jones' email address MAINTAINERS: Use Lee Jones' kernel.org address for Syscon submissions MAINTAINERS: Use Lee Jones' kernel.org address for MFD submissions mfd: sun6i-prcm: Update Kconfig description mfd: intel_soc_pmic_bxtwc: Fix spelling in the comment mfd: intel_soc_pmic_bxtwc: Drop unneeded casting mfd: intel_soc_pmic_bxtwc: Use sysfs_emit() instead of sprintf() mfd: intel_soc_pmic_bxtwc: Use bits.h macros for all masks mfd: intel_soc_pmic_bxtwc: Drop redundant ACPI_PTR() mfd: intel_soc_pmic_bxtwc: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc mfd: intel_soc_pmic_bxtwc: Extend use of temporary variable for struct device mfd: intel_soc_pmic_bxtwc: Use dev_err_probe() mfd: intel_soc_pmic_bxtwc: Convert to use platform_get/set_drvdata() mfd: intel_soc_pmic_bxtwc: Create sysfs attributes using core driver's facility mfd: intel_soc_pmic_bxtwc: Don't shadow error codes in show()/store() mfd: intel-lpss: Add Intel Meteor Lake-P PCI IDs mfd: mt6397: Add basic support for MT6331+MT6332 PMIC mfd: axp20x: Add AXP221/AXP223/AXP809 GPIO cells ...
2 parents 668c3c2 + ae4ccae commit 613b2a8

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

+3565
-762
lines changed

Documentation/devicetree/bindings/mfd/da9063.txt

Lines changed: 0 additions & 114 deletions
This file was deleted.
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/mfd/dlg,da9063.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Dialog DA9063/DA9063L Power Management Integrated Circuit (PMIC)
8+
9+
maintainers:
10+
- Steve Twiss <[email protected]>
11+
12+
description: |
13+
For device-tree bindings of other sub-modules refer to the binding documents
14+
under the respective sub-system directories.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- dlg,da9063
20+
- dlg,da9063l
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
interrupt-controller: true
29+
30+
"#interrupt-cells":
31+
const: 2
32+
33+
dlg,use-sw-pm:
34+
type: boolean
35+
description:
36+
Disable the watchdog during suspend.
37+
Only use this option if you can't use the watchdog automatic suspend
38+
function during a suspend (see register CONTROL_B).
39+
40+
watchdog:
41+
type: object
42+
$ref: /schemas/watchdog/watchdog.yaml#
43+
unevaluatedProperties: false
44+
properties:
45+
compatible:
46+
const: dlg,da9063-watchdog
47+
48+
rtc:
49+
type: object
50+
$ref: /schemas/rtc/rtc.yaml#
51+
unevaluatedProperties: false
52+
properties:
53+
compatible:
54+
const: dlg,da9063-rtc
55+
56+
onkey:
57+
type: object
58+
$ref: /schemas/input/input.yaml#
59+
unevaluatedProperties: false
60+
properties:
61+
compatible:
62+
const: dlg,da9063-onkey
63+
64+
dlg,disable-key-power:
65+
type: boolean
66+
description: |
67+
Disable power-down using a long key-press.
68+
If this entry does not exist then by default the key-press triggered
69+
power down is enabled and the OnKey will support both KEY_POWER and
70+
KEY_SLEEP.
71+
72+
regulators:
73+
type: object
74+
patternProperties:
75+
"^(ldo[1-11]|bcore[1-2]|bpro|bmem|bio|bperi)$":
76+
$ref: /schemas/regulator/regulator.yaml
77+
unevaluatedProperties: false
78+
79+
required:
80+
- compatible
81+
- reg
82+
- interrupts
83+
- interrupt-controller
84+
85+
additionalProperties: false
86+
87+
examples:
88+
- |
89+
#include <dt-bindings/interrupt-controller/irq.h>
90+
i2c {
91+
#address-cells = <1>;
92+
#size-cells = <0>;
93+
pmic@58 {
94+
compatible = "dlg,da9063";
95+
reg = <0x58>;
96+
#interrupt-cells = <2>;
97+
interrupt-parent = <&gpio6>;
98+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
99+
interrupt-controller;
100+
101+
rtc {
102+
compatible = "dlg,da9063-rtc";
103+
};
104+
105+
watchdog {
106+
compatible = "dlg,da9063-watchdog";
107+
};
108+
109+
onkey {
110+
compatible = "dlg,da9063-onkey";
111+
dlg,disable-key-power;
112+
};
113+
114+
regulators {
115+
regulator-bcore1 {
116+
regulator-name = "BCORE1";
117+
regulator-min-microvolt = <300000>;
118+
regulator-max-microvolt = <1570000>;
119+
regulator-min-microamp = <500000>;
120+
regulator-max-microamp = <2000000>;
121+
regulator-boot-on;
122+
};
123+
regulator-ldo11 {
124+
regulator-name = "LDO_11";
125+
regulator-min-microvolt = <900000>;
126+
regulator-max-microvolt = <3600000>;
127+
regulator-boot-on;
128+
};
129+
};
130+
};
131+
};
132+
...

Documentation/devicetree/bindings/mfd/mps,mp2629.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ description: |
1818
1919
properties:
2020
compatible:
21-
const: mps,mp2629
21+
enum:
22+
- mps,mp2629
23+
- mps,mp2733
2224

2325
reg:
2426
maxItems: 1

Documentation/devicetree/bindings/mfd/mt6397.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This document describes the binding for MFD device and its sub module.
2020
Required properties:
2121
compatible:
2222
"mediatek,mt6323" for PMIC MT6323
23+
"mediatek,mt6331" for PMIC MT6331 and MT6332
2324
"mediatek,mt6358" for PMIC MT6358 and MT6366
2425
"mediatek,mt6359" for PMIC MT6359
2526
"mediatek,mt6397" for PMIC MT6397
@@ -29,6 +30,7 @@ Optional subnodes:
2930
- rtc
3031
Required properties: Should be one of follows
3132
- compatible: "mediatek,mt6323-rtc"
33+
- compatible: "mediatek,mt6331-rtc"
3234
- compatible: "mediatek,mt6358-rtc"
3335
- compatible: "mediatek,mt6397-rtc"
3436
For details, see ../rtc/rtc-mt6397.txt
@@ -52,8 +54,10 @@ Optional subnodes:
5254
see ../leds/leds-mt6323.txt
5355

5456
- keys
55-
Required properties:
56-
- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys"
57+
Required properties: Should be one of the following
58+
- compatible: "mediatek,mt6323-keys"
59+
- compatible: "mediatek,mt6331-keys"
60+
- compatible: "mediatek,mt6397-keys"
5761
see ../input/mtk-pmic-keys.txt
5862

5963
- power-controller

Documentation/devicetree/bindings/mfd/qcom,tcsr.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/qcom,tcsr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Top Control and Status Register
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
description:
13+
Qualcomm devices have a set of registers that provide various control and
14+
status functions for their peripherals.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- items:
20+
- enum:
21+
- qcom,tcsr-apq8064
22+
- qcom,tcsr-apq8084
23+
- qcom,tcsr-ipq8064
24+
- qcom,tcsr-mdm9615
25+
- qcom,tcsr-msm8660
26+
- qcom,tcsr-msm8916
27+
- qcom,tcsr-msm8953
28+
- qcom,tcsr-msm8960
29+
- qcom,tcsr-msm8974
30+
- const: syscon
31+
- items:
32+
- const: qcom,tcsr-ipq6018
33+
- const: syscon
34+
- const: simple-mfd
35+
36+
reg:
37+
maxItems: 1
38+
39+
required:
40+
- compatible
41+
- reg
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
syscon@1a400000 {
48+
compatible = "qcom,tcsr-msm8960", "syscon";
49+
reg = <0x1a400000 0x100>;
50+
};

Documentation/devicetree/bindings/mfd/qcom-pm8xxx.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: Qualcomm PM8xxx PMIC multi-function devices
88

99
maintainers:
10-
- Satya Priya <[email protected]>
10+
- Satya Priya <[email protected]>
1111

1212
description: |
1313
The PM8xxx family of Power Management ICs are used to provide regulated

0 commit comments

Comments
 (0)