Skip to content

Commit 25c456d

Browse files
committed
Merge tag 'mfd-next-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Core: - Add a resource-managed version of alloc_workqueue() (`devm_alloc_workqueue()`) - Preserve the Open Firmware (OF) node when an ACPI handle is present Apple SMC: - Wire up the Apple SMC power driver by adding a new MFD cell Atmel HLCDC: - Fetch the LVDS PLL clock as a fallback if the generic sys_clk is unavailable Broadcom BCM2835 PM: - Add support for the BCM2712 power management device - Introduce a hardware type identifier to distinguish SoC variants Congatec CGBC, KEMPLD, RSMU, Si476x: - Fix various kernel-doc warnings and correct struct member names DLN2: - Drop redundant USB device references and switch to managed resource allocations - Update bare 'unsigned' types to 'unsigned int' ENE KB3930: - Use the of_device_is_system_power_controller() wrapper EZX PCAP: - Avoid rescheduling after destroying the workqueue by switching to a device-managed workqueue - Drop redundant memory allocation error messages - Return directly instead of using empty goto statements Freescale i.MX25 TSADC: - Convert devicetree bindings from TXT to YAML format Freescale MC13xxx: - Fix a memory leak in subdevice platform data allocation by using devm_kmemdup() Intel LPC ICH: - Expose a software node for the GPIO controller cell to fix GPIO lookups Intel LPSS: - Add PCI IDs for the Intel Nova Lake-H platform Maxim MAX77620: - Convert devicetree bindings from TXT to YAML format - Document an optional I2C address for the MAX77663 RTC device Maxim MAX77705: - Make the max77705_pm_ops variable static to resolve a sparse warning MediaTek MT6397: - Correct the hardware CIDs for the MT6328, MT6331, and MT6332 PMICs to allow proper driver binding ROHM BD71828: - Enable system wakeup via the power button ROHM BD72720: - Add a new compatible string for the ROHM BD73900 PMIC SpacemiT P1: - Drop the deprecated "vin-supply" property from the devicetree bindings - Add individual regulator supply properties to match actual hardware topology STMicroelectronics STPMIC1: - Attempt system shutdown a second time to handle transient I2C communication failures Viperboard: - Drop redundant USB device references" * tag 'mfd-next-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (28 commits) mfd: core: Preserve OF node when ACPI handle is present mfd: ene-kb3930: Use of_device_is_system_power_controller() wrapper mfd: intel-lpss: Add Intel Nova Lake-H PCI IDs dt-bindings: mfd: max77620: Document optional RTC address for MAX77663 dt-bindings: mfd: max77620: Convert to DT schema mfd: ezx-pcap: Avoid rescheduling after destroying workqueue mfd: ezx-pcap: Return directly instead of empty gotos mfd: ezx-pcap: Drop memory allocation error message mfd: bcm2835-pm: Add BCM2712 PM device support mfd: bcm2835-pm: Introduce SoC-specific type identifier dt-bindings: mfd: bd72720: Add ROHM BD73900 mfd: si476x: Fix kernel-doc warnings mfd: rsmu: Remove a empty kernel-doc line mfd: kempld: Fix kernel-doc struct member names mfd: congatec: Fix kernel-doc struct member names dt-bindings: mfd: Convert fsl-imx25-tsadc.txt to yaml format mfd: viperboard: Drop redundant device reference mfd: dln2: Switch to managed resources and fix bare unsigned types mfd: macsmc: Wire up Apple SMC power driver mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332 ...
2 parents 4b0b946 + caa5a5d commit 25c456d

30 files changed

Lines changed: 680 additions & 356 deletions

Documentation/devicetree/bindings/gpio/trivial-gpio.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ properties:
2727
- gateworks,pld-gpio
2828
- ibm,ppc4xx-gpio
2929
- loongson,ls1x-gpio
30-
- maxim,max77620
3130
- nintendo,hollywood-gpio
3231
- nxp,pca9570
3332
- nxp,pca9571
@@ -86,7 +85,6 @@ allOf:
8685
compatible:
8786
contains:
8887
enum:
89-
- maxim,max77620
9088
- rockchip,rk3328-grf-gpio
9189
- ti,lp3943-gpio
9290
- ti,palmas-gpio
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/fsl,imx25-tsadc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale MX25 ADC/TSC MultiFunction Device (MFD)
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
description:
13+
This device combines two general purpose conversion queues one used for general
14+
ADC and the other used for touchscreens.
15+
16+
properties:
17+
compatible:
18+
const: fsl,imx25-tsadc
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
clock-names:
30+
items:
31+
- const: ipg
32+
33+
interrupt-controller: true
34+
35+
'#interrupt-cells':
36+
const: 1
37+
38+
'#address-cells':
39+
const: 1
40+
41+
'#size-cells':
42+
const: 1
43+
44+
ranges: true
45+
46+
patternProperties:
47+
'^touchscreen@[0-9a-f]+$':
48+
type: object
49+
$ref: /schemas/input/touchscreen/fsl,imx25-tcq.yaml
50+
unevaluatedProperties: false
51+
52+
'^adc@[0-9a-f]+$':
53+
type: object
54+
$ref: /schemas/iio/adc/fsl,imx25-gcq.yaml
55+
unevaluatedProperties: false
56+
57+
required:
58+
- compatible
59+
- reg
60+
- interrupts
61+
- clocks
62+
- clock-names
63+
- '#interrupt-cells'
64+
- '#address-cells'
65+
- '#size-cells'
66+
67+
additionalProperties: false
68+
69+
examples:
70+
- |
71+
tscadc@50030000 {
72+
compatible = "fsl,imx25-tsadc";
73+
reg = <0x50030000 0xc>;
74+
interrupts = <46>;
75+
clocks = <&clks 119>;
76+
clock-names = "ipg";
77+
interrupt-controller;
78+
#interrupt-cells = <1>;
79+
#address-cells = <1>;
80+
#size-cells = <1>;
81+
ranges;
82+
83+
touchscreen@50030400 {
84+
compatible = "fsl,imx25-tcq";
85+
reg = <0x50030400 0x60>;
86+
interrupts = <0>;
87+
fsl,wires = <4>;
88+
};
89+
90+
adc@50030800 {
91+
compatible = "fsl,imx25-gcq";
92+
reg = <0x50030800 0x60>;
93+
interrupts = <1>;
94+
#address-cells = <1>;
95+
#size-cells = <0>;
96+
};
97+
};

Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt

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

Documentation/devicetree/bindings/mfd/max77620.txt

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

0 commit comments

Comments
 (0)