Skip to content

Commit 71a5cc2

Browse files
committed
Merge tag 'mfd-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Core Framework: - Add support for Software Nodes to MFD Core - Remove support for Device Properties from MFD Core - Use standard APIs in MFD Core New Drivers: - Add support for ROHM BD9576MUF and BD9573MUF PMICs - Add support for Netronix Embedded Controller, PWM and RTC - Add support for Actions Semi ATC260x PMICs and OnKey New Device Support: - Add support for DG1 PCIe Graphics Card to Intel PMT - Add support for ROHM BD71815 PMIC to ROHM BD71828 - Add support for Tolino Shine 2 HD to Netronix Embedded Controller - Add support for AX10 BMC Secure Updates to Intel M10 BMC Removed Device Support: - Remove Arizona Extcon support from MFD - Remove ST-E AB8500 Power Supply code from MFD - Remove AB3100 altogether New Functionality: - Add support for SMBus and I2C modes to Dialog DA9063 - Switch to using Software Nodes in Intel (various) New/converted Device Tree bindings: - rohm bd71815-pmic, rohm bd9576-pmic, netronix ntxec, actions atc260x, ricoh rn5t618, qcom pm8xxx - Fix-ups: - Fix error handling/path; intel_pmt - Simplify code; rohm-bd718x7, ab8500-core, intel-m10-bmc - Trivial clean-ups (reordering, spelling); rohm-generic, rn5t618, max8997 - Use correct data-type; db8500-prcmu - Remove superfluous code; lp87565, intel_quark_i2c_gpi, lpc_sch, twl - Use generic APIs/defines; lm3533-core, intel_quark_i2c_gpio - Regmap related fix-ups; intel-m10-bmc, sec-core - Reorder resource freeing during remove; intel_quark_i2c_gpio - Make table indexing more robust; intel_quark_i2c_gpio - Fix reference imbalances; arizona-irq - Staticify and (un)constify things; arizona-spi, stmpe, ene-kb3930, intel-lpss-acpi, intel-lpss-pci, atc260x-i2c, intel_quark_i2c_gpio Bug Fixes: - Fix incorrect (register) values; intel-m10-bmc - Kconfig related fixes; ABX500_CORE - Do not clear the Auto Reload Register; stm32-timers" * tag 'mfd-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (84 commits) mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates Revert "mfd: max8997: Add of_compatible to Extcon and Charger mfd_cell" mfd: twl: Remove unused inline function twl4030charger_usb_en() dt-bindings: mfd: Convert pm8xxx bindings to yaml dt-bindings: mfd: Add compatible for pmk8350 rtc i2c: designware: Get rid of legacy platform data mfd: intel_quark_i2c_gpio: Convert I²C to use software nodes mfd: lpc_sch: Partially revert "Add support for Intel Quark X1000" mfd: arizona: Fix rumtime PM imbalance on error mfd: max8997: Replace 8998 with 8997 mfd: core: Use acpi_find_child_device() for child devices lookup mfd: intel_quark_i2c_gpio: Don't play dirty trick with const mfd: intel_quark_i2c_gpio: Enable MSI interrupt mfd: intel_quark_i2c_gpio: Reuse BAR definitions for MFD cell indexing mfd: ntxec: Support for EC in Tolino Shine 2 HD mfd: stm32-timers: Avoid clearing auto reload register mfd: intel_quark_i2c_gpio: Replace I²C speeds with descriptive definitions mfd: intel_quark_i2c_gpio: Remove unused struct device member mfd: intel_quark_i2c_gpio: Unregister resources in reversed order mfd: Kconfig: ABX500_CORE should depend on ARCH_U8500 ...
2 parents be18cd1 + f9386c9 commit 71a5cc2

Some content is hidden

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

93 files changed

+5919
-2050
lines changed

CREDITS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,6 +1933,9 @@ N: Kukjin Kim
19331933
19341934
D: Samsung S3C, S5P and Exynos ARM architectures
19351935

1936+
N: Milo Kim
1937+
D: TI LP855x, LP8727 and LP8788 drivers
1938+
19361939
N: Sangbeom Kim
19371940
19381941
D: Samsung SoC Audio (ASoC) drivers

Documentation/devicetree/bindings/input/input.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,11 @@ properties:
3333
power off automatically. Device with key pressed shutdown feature can
3434
specify this property.
3535

36+
reset-time-sec:
37+
description:
38+
Duration in seconds which the key should be kept pressed for device to
39+
reset automatically. Device with key pressed reset feature can specify
40+
this property.
41+
$ref: /schemas/types.yaml#/definitions/uint32
42+
3643
additionalProperties: true
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/actions,atc260x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Actions Semi ATC260x Power Management IC bindings
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <[email protected]>
11+
- Cristian Ciocaltea <[email protected]>
12+
13+
description: |
14+
ATC260x series PMICs integrates Audio Codec, Power Management, RTC, IR
15+
and GPIO controller blocks. Currently only the PM related functionalities
16+
(i.e. regulators and system power-off/reboot) for the ATC2603C and ATC2609A
17+
chip variants are supported.
18+
ATC2603C includes 3 programmable DC-DC converters, 9 programmable LDO
19+
regulators and 1 fixed LDO regulator.
20+
ATC2609A includes 5 programmable DC-DC converters and 10 programmable LDO
21+
regulators.
22+
23+
allOf:
24+
- $ref: ../input/input.yaml
25+
26+
properties:
27+
compatible:
28+
enum:
29+
- actions,atc2603c
30+
- actions,atc2609a
31+
32+
reg:
33+
maxItems: 1
34+
35+
interrupts:
36+
maxItems: 1
37+
38+
reset-time-sec:
39+
description: |
40+
Duration in seconds which the key should be kept pressed for device
41+
to reset automatically. The hardware default is 8. Use 0 to disable
42+
this functionality.
43+
enum: [0, 6, 8, 10, 12]
44+
45+
regulators:
46+
type: object
47+
description: |
48+
List of child nodes specifying the regulators, depending on chip variant:
49+
* ATC2603C: dcdc[1-3], ldo[1-3,5-8,11,12], switchldo1
50+
* ATC2609A: dcdc[0-4], ldo[0-9]
51+
52+
properties:
53+
compatible:
54+
enum:
55+
- actions,atc2603c-regulator
56+
- actions,atc2609a-regulator
57+
58+
switchldo1:
59+
type: object
60+
$ref: ../regulator/regulator.yaml
61+
62+
properties:
63+
regulator-name: true
64+
regulator-boot-on: true
65+
regulator-always-on: true
66+
regulator-min-microvolt: true
67+
regulator-max-microvolt: true
68+
regulator-allow-bypass: true
69+
regulator-active-discharge: true
70+
71+
additionalProperties: false
72+
73+
patternProperties:
74+
"^(dcdc[0-4]|ldo[0-9]|ldo1[1-2]|switchldo1)-supply$":
75+
description: ATC260x voltage regulators supplies
76+
77+
"^(dcdc[0-4]|ldo[0-9]|ldo1[1-2])$":
78+
type: object
79+
$ref: ../regulator/regulator.yaml
80+
81+
properties:
82+
regulator-name: true
83+
regulator-boot-on: true
84+
regulator-always-on: true
85+
regulator-min-microvolt: true
86+
regulator-max-microvolt: true
87+
regulator-allow-bypass: true
88+
89+
additionalProperties: false
90+
91+
allOf:
92+
- if:
93+
properties:
94+
compatible:
95+
contains:
96+
const: actions,atc2603c-regulator
97+
then:
98+
patternProperties:
99+
"^(dcdc[0,4]|ldo[0,4,9])(-supply)?$": false
100+
101+
"^(ldo|dcdc)":
102+
properties:
103+
regulator-allow-bypass: false
104+
- if:
105+
properties:
106+
compatible:
107+
contains:
108+
const: actions,atc2609a-regulator
109+
then:
110+
patternProperties:
111+
"^(ldo1[1-2]|switchldo1)(-supply)?$": false
112+
113+
"^(dcdc|ldo[3-9])":
114+
properties:
115+
regulator-allow-bypass: false
116+
117+
required:
118+
- compatible
119+
120+
additionalProperties: false
121+
122+
additionalProperties: false
123+
124+
required:
125+
- compatible
126+
- reg
127+
- interrupts
128+
129+
examples:
130+
- |
131+
#include <dt-bindings/interrupt-controller/arm-gic.h>
132+
i2c0 {
133+
#address-cells = <1>;
134+
#size-cells = <0>;
135+
136+
pmic@65 {
137+
compatible = "actions,atc2603c";
138+
reg = <0x65>;
139+
interrupt-parent = <&sirq>;
140+
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
141+
142+
reset-time-sec = <6>;
143+
144+
regulators {
145+
compatible = "actions,atc2603c-regulator";
146+
147+
dcdc1-supply = <&reg_5v0>;
148+
dcdc3-supply = <&reg_5v0>;
149+
ldo5-supply = <&reg_5v0>;
150+
switchldo1-supply = <&vcc>;
151+
152+
vdd_cpu: dcdc1 {
153+
regulator-name = "VDD_CPU";
154+
regulator-min-microvolt = <700000>;
155+
regulator-max-microvolt = <1400000>;
156+
regulator-always-on;
157+
};
158+
159+
vcc: dcdc3 {
160+
regulator-name = "VCC";
161+
regulator-min-microvolt = <2600000>;
162+
regulator-max-microvolt = <3300000>;
163+
regulator-always-on;
164+
};
165+
166+
vcc_3v1: ldo5 {
167+
regulator-name = "VCC_3V1";
168+
regulator-min-microvolt = <2600000>;
169+
regulator-max-microvolt = <3300000>;
170+
};
171+
172+
sd_vcc: switchldo1 {
173+
regulator-name = "SD_VCC";
174+
regulator-min-microvolt = <3000000>;
175+
regulator-max-microvolt = <3300000>;
176+
regulator-always-on;
177+
regulator-boot-on;
178+
};
179+
};
180+
};
181+
};
182+
183+
...
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/netronix,ntxec.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Netronix Embedded Controller
8+
9+
maintainers:
10+
- Jonathan Neuschäfer <[email protected]>
11+
12+
description: |
13+
This EC is found in e-book readers of multiple brands (e.g. Kobo, Tolino), and
14+
is typically implemented as a TI MSP430 microcontroller.
15+
16+
properties:
17+
compatible:
18+
const: netronix,ntxec
19+
20+
reg:
21+
items:
22+
- description: The I2C address of the EC
23+
24+
system-power-controller:
25+
type: boolean
26+
description: See Documentation/devicetree/bindings/power/power-controller.txt
27+
28+
interrupts:
29+
minItems: 1
30+
description:
31+
The EC can signal interrupts via a GPIO line
32+
33+
"#pwm-cells":
34+
const: 2
35+
description: |
36+
Number of cells in a PWM specifier.
37+
38+
The following PWM channels are supported:
39+
- 0: The PWM channel controlled by registers 0xa1-0xa7
40+
41+
required:
42+
- compatible
43+
- reg
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/interrupt-controller/irq.h>
50+
i2c {
51+
#address-cells = <1>;
52+
#size-cells = <0>;
53+
54+
ec: embedded-controller@43 {
55+
pinctrl-names = "default";
56+
pinctrl-0 = <&pinctrl_ntxec>;
57+
58+
compatible = "netronix,ntxec";
59+
reg = <0x43>;
60+
system-power-controller;
61+
interrupt-parent = <&gpio4>;
62+
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
63+
#pwm-cells = <2>;
64+
};
65+
};
66+
67+
backlight {
68+
compatible = "pwm-backlight";
69+
pwms = <&ec 0 50000>;
70+
power-supply = <&backlight_regulator>;
71+
};
72+
73+
backlight_regulator: regulator-dummy {
74+
compatible = "regulator-fixed";
75+
regulator-name = "backlight";
76+
};

Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt

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

0 commit comments

Comments
 (0)