Skip to content

Commit 4668c48

Browse files
committed
Merge tag 'mfd-next-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Support & Features: - Add comprehensive support for the ROHM BD72720 PMIC, including core MFD, regulator, GPIO, clock gate, RTC, and power-supply drivers - Add support for the Rockchip RK801 PMIC, including core MFD and regulator drivers - Add support for the ROHM BD73900 PMIC by leveraging existing common drivers - Wire up RTC, hwmon, and input sub-devices for the Apple SMC (macsmc) driver - Add support for the Delta Networks TN48M switch CPLD via the simple-mfd-i2c driver - Add support for the TS133 variant to the QNAP MCU driver - Provide support for the sama7d65 XLCD controller in the Atmel HLCDC driver - Add backlight sub-device support to the Congatec Board Controller (cgbc) - Add Intel Nova Lake-S (NVL-S) PCI IDs to the Intel LPSS driver Improvements & Fixes: - Implement a "wrapper regmap" for the ROHM BD72720 to handle dual I2C slave addresses (0x4b and 0x4c) transparently for child devices - Introduce mutex locking around 'mfd_of_node_list' in the MFD core to ensure safe concurrent access - Fix a potential regulator resource leak in the Arizona core driver during boot sequence failures - Resolve child device duplication issues on driver rebind for Qualcomm PM8xxx and OMAP USB host drivers by using of_platform_depopulate() - Fix IRQ domain name duplication for the Samsung S2MPG10 by adding a unique domain suffix - Implement LOCK register handling for the TI TPS65214 variant to unlock registers at probe time - Fully convert the Loongson-2K BMC driver to use managed resources (pcim) and the standard PCI resource API - Ensure the Apple SMC mutex is correctly initialized during probe to prevent NULL pointer dereferences - Expand the ROHM BD71828 power-supply driver to support 9-bit register addresses - Simplify the Samsung S5M RTC driver by querying platform device IRQ resources directly - Revert an incorrect read-to-write mask change in the DA9052 SPI driver to restore default OTP behavior - Fix kernel-doc warnings in the TI TPS6105x driver - Cleanups & Refactoring - Simplify the MFD core by utilizing the scoped for_each_child_of_node_scoped() macro and streamlining device_node storage - Rename ROHM BD71828 IC-specific entities to use consistent prefixes for better extensibility - Refactor ROHM BD71828 regmap definitions using the regmap_reg_range() macro - Update the ROHM BD71828 driver to use standard C-style comment headers - Remove the now unused 'irq_data' field from the Samsung SEC core structure - Drop unnecessary use of irqd_get_trigger_type() in the Maxim MAX77759 driver - Default MFD_SPACEMIT_P1 to 'm' if ARCH_SPACEMIT is selected - Add missing charger-related registers to the ROHM BD71828 core header and Type-C CC registers to the AXP717 Device Tree Binding Updates: - Add new bindings for the ROHM BD72720 PMIC, Rockchip RK801 PMIC, Bitmain BM1880 System Controller, and NXP LPC32xx System Control Block - Clarify trickle-charge terminology and add properties for voltage drop (VDR) correction and upper charge limits to the generic battery binding - Document GPR syscon for NXP S32 SoCs and the smp-memram subnode for Aspeed SCU - Document numerous new Qualcomm SPMI PMIC compatibles (pmcx0102, pmh0101, pmk8850, etc) - Add compatibles for the sama7d65 XLCD (Atmel), LAN9691 Flexcom (Microchip), and various MediaTek SCPSYS and regulator components - Fix a dead link to the audio codec binding in the DA9055 documentation" * tag 'mfd-next-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (41 commits) dt-bindings: mfd: da9055: Fix dead link to codec binding mfd: cgbc: Add support for backlight dt-bindings: mfd: qcom,spmi-pmic: Document PMICs present on Glymur and Kaanapali dt-bindings: mfd: Document smp-memram subnode for aspeed,ast2x00-scu mfd: intel-lpss: Add Intel Nova Lake-S PCI IDs mfd: ls2kbmc: Use PCI API instead of direct accesses mfd: ls2kbmc: Fully convert to use managed resources dt-bindings: mfd: mediatek: mt6397: Add missing MT6331 regulator compat dt-bindings: mfd: mediatek,mt8195-scpsys: Add mediatek,mt6795-scpsys dt-bindings: mfd: atmel,sama5d2-flexcom: Add microchip,lan9691-flexcom mfd: omap-usb-host: Fix OF populate on driver rebind mfd: qcom-pm8xxx: Fix OF populate on driver rebind dt-bindings: mfd: syscon: Allow syscon compatible for mediatek,mt7981-topmisc mfd: qnap-mcu: Add driver data for TS133 variant dt-bindings: mfd: qnap,ts433-mcu: Add qnap,ts133-mcu compatible mfd: sec: Fix IRQ domain names duplication mfd: simple-mfd-i2c: Add Delta TN48M CPLD support mfd: macsmc: Initialize mutex dt-bindings: mfd: nxp: Add NXP LPC32xx System Control Block mfd: Kconfig: Default MFD_SPACEMIT_P1 to 'm' if ARCH_SPACEMIT ...
2 parents 46a1daa + 8457761 commit 4668c48

37 files changed

Lines changed: 955 additions & 79 deletions

Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,23 @@ patternProperties:
130130
- description: silicon id information registers
131131
- description: unique chip id registers
132132

133+
'^smp-memram@[0-9a-f]+$':
134+
description: Memory region used for the AST2600's custom SMP bringup protocol
135+
type: object
136+
additionalProperties: false
137+
138+
properties:
139+
compatible:
140+
const: aspeed,ast2600-smpmem
141+
142+
reg:
143+
description: The SMP memory region
144+
maxItems: 1
145+
146+
required:
147+
- compatible
148+
- reg
149+
133150
required:
134151
- compatible
135152
- reg

Documentation/devicetree/bindings/mfd/atmel,hlcdc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- atmel,sama5d4-hlcdc
2626
- microchip,sam9x60-hlcdc
2727
- microchip,sam9x75-xlcdc
28+
- microchip,sama7d65-xlcdc
2829

2930
reg:
3031
maxItems: 1

Documentation/devicetree/bindings/mfd/atmel,sama5d2-flexcom.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- const: atmel,sama5d2-flexcom
2121
- items:
2222
- enum:
23+
- microchip,lan9691-flexcom
2324
- microchip,sam9x7-flexcom
2425
- microchip,sama7d65-flexcom
2526
- microchip,sama7g5-flexcom
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/bitmain,bm1880-sctrl.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bitmain BM1880 System Controller
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <mani@kernel.org>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- const: bitmain,bm1880-sctrl
16+
- const: syscon
17+
- const: simple-mfd
18+
19+
reg:
20+
maxItems: 1
21+
22+
ranges: true
23+
24+
'#address-cells':
25+
const: 1
26+
27+
'#size-cells':
28+
const: 1
29+
30+
patternProperties:
31+
'^pinctrl@[0-9a-f]+$':
32+
type: object
33+
additionalProperties: true
34+
35+
properties:
36+
compatible:
37+
contains:
38+
const: bitmain,bm1880-pinctrl
39+
40+
'^clock-controller@[0-9a-f]+$':
41+
type: object
42+
additionalProperties: true
43+
44+
properties:
45+
compatible:
46+
contains:
47+
const: bitmain,bm1880-clk
48+
49+
'^reset-controller@[0-9a-f]+$':
50+
type: object
51+
additionalProperties: true
52+
53+
properties:
54+
compatible:
55+
contains:
56+
const: bitmain,bm1880-reset
57+
58+
required:
59+
- compatible
60+
- reg
61+
- ranges
62+
- '#address-cells'
63+
- '#size-cells'
64+
65+
additionalProperties: false
66+
...

Documentation/devicetree/bindings/mfd/da9055.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The CODEC device in DA9055 has a separate, configurable I2C address and so
1515
is instantiated separately from the PMIC.
1616

1717
For details on accompanying CODEC I2C device, see the following:
18-
Documentation/devicetree/bindings/sound/da9055.txt
18+
Documentation/devicetree/bindings/sound/trivial-codec.yaml
1919

2020
======
2121

Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ properties:
9090
- enum:
9191
- mediatek,mt6323-regulator
9292
- mediatek,mt6328-regulator
93+
- mediatek,mt6331-regulator
9394
- mediatek,mt6358-regulator
9495
- mediatek,mt6359-regulator
9596
- mediatek,mt6397-regulator

Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
compatible:
2020
items:
2121
- enum:
22+
- mediatek,mt6795-scpsys
2223
- mediatek,mt6893-scpsys
2324
- mediatek,mt8167-scpsys
2425
- mediatek,mt8173-scpsys
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/nxp,lpc3220-scb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP LPC32xx System Control Block
8+
9+
maintainers:
10+
- Vladimir Zapolskiy <vz@mleia.com>
11+
12+
description:
13+
NXP LPC32xx SoC series have a System Control Block, which serves for
14+
a multitude of purposes including clock management, DMA muxes, storing
15+
SoC unique ID etc.
16+
17+
properties:
18+
compatible:
19+
items:
20+
- enum:
21+
- nxp,lpc3220-scb
22+
- const: syscon
23+
- const: simple-mfd
24+
25+
reg:
26+
maxItems: 1
27+
28+
ranges: true
29+
30+
"#address-cells":
31+
const: 1
32+
33+
"#size-cells":
34+
const: 1
35+
36+
patternProperties:
37+
"^clock-controller@[0-9a-f]+$":
38+
$ref: /schemas/clock/nxp,lpc3220-clk.yaml#
39+
40+
"^dma-router@[0-9a-f]+$":
41+
$ref: /schemas/dma/nxp,lpc3220-dmamux.yaml#
42+
43+
required:
44+
- compatible
45+
- reg
46+
- "#address-cells"
47+
- "#size-cells"
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
syscon@400040000 {
54+
compatible = "nxp,lpc3220-scb", "syscon", "simple-mfd";
55+
reg = <0x40004000 0x1000>;
56+
#address-cells = <1>;
57+
#size-cells = <1>;
58+
ranges = <0 0x40004000 0x1000>;
59+
60+
clock-controller@0 {
61+
compatible = "nxp,lpc3220-clk";
62+
reg = <0x0 0x114>;
63+
clocks = <&xtal_32k>, <&xtal>;
64+
clock-names = "xtal_32k", "xtal";
65+
#clock-cells = <1>;
66+
};
67+
68+
dma-router@78 {
69+
compatible = "nxp,lpc3220-dmamux";
70+
reg = <0x78 0x8>;
71+
dma-masters = <&dma>;
72+
#dma-cells = <3>;
73+
};
74+
};

Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ properties:
7777
- qcom,pmc8180
7878
- qcom,pmc8180c
7979
- qcom,pmc8380
80+
- qcom,pmcx0102
8081
- qcom,pmd8028
8182
- qcom,pmd9635
83+
- qcom,pmh0101
84+
- qcom,pmh0104
85+
- qcom,pmh0110
8286
- qcom,pmi632
8387
- qcom,pmi8950
8488
- qcom,pmi8962
@@ -89,6 +93,7 @@ properties:
8993
- qcom,pmk8002
9094
- qcom,pmk8350
9195
- qcom,pmk8550
96+
- qcom,pmk8850
9297
- qcom,pmm8155au
9398
- qcom,pmm8654au
9499
- qcom,pmp8074
@@ -101,6 +106,7 @@ properties:
101106
- qcom,pmx75
102107
- qcom,smb2351
103108
- qcom,smb2360
109+
- qcom,smb2370
104110
- const: qcom,spmi-pmic
105111

106112
reg:

Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qnap,ts133-mcu
1920
- qnap,ts233-mcu
2021
- qnap,ts433-mcu
2122

0 commit comments

Comments
 (0)