Skip to content

Commit c2c23dc

Browse files
committed
Merge tag 'mfd-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Core Framework: - Change MFD support status from Supported to Maintained New Drivers: - Add support for the Intel Platform Management Component Interface (PMCI) Removed Drivers: - HTC PASIC3 LED/DS1WM - Toshiba T7L66XB, TC6387XB and TC6393XB TMIO New Device Support: - Add support for N6000 Flash to Intel M10 BMC PMCI - Add support for Lenovo Yoga Tab 3 to Intel CHTWC PMIC New Functionality: - Provide Reset support to Syscon Fix-ups: - Explicitly provide missing include files - Pass platform type data/info via the SPI/I2C/DT registration strategy - Lots of DT documentation / adaptions - Replace scnprintf() with preferred sysfs_emit() - Remove unused / superfluous code - Fix some trivial whitesspace / spelling / grammatical issues - Replace pm_power_off with new and improved register_sys_off_handler() API Bug Fixes: - Reintroduce RK808-clkout registration - fixing Wi-Fi and Bluetooth - Repair the order of AXPxxx IRQ PEK RISE/FALL definitions - Refuse to build CS5535 on unsupported UML architectures - Fix memory leaks in error return paths - Prevent refcount leaks in error return paths" * tag 'mfd-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (40 commits) dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332 dt-bindings: mfd: Add NXP BBNSM mfd: ntxec: Add version number for EC in Tolino Vision dt-bindings: mfd: syscon: Add mt8365-syscfg mfd: Remove toshiba tmio drivers mfd: arizona: Use pm_runtime_resume_and_get() to prevent refcnt leak mfd: syscon: Allow reset control for syscon devices dt-bindings: mfd/syscon: Add resets property dt-bindings: mfd: syscon: Add amd,pensando-elba-syscon compatible dt-bindings: mfd: qcom,tcsr: Add compatible for MSM8226 mfd: simple-mfd-i2c: Fix incoherent comment regarding DT registration mfd: axp20x: Switch to the sys-off handler API mfd: core: Spelling s/compement/complement/ mfd: max8925: Remove the unused function irq_to_max8925() mfd: qcom-pm8xxx: Remove set but unused variable 'rev' dt-bindings: mfd: syscon: Document GXP register compatible mfd: twl4030-power: Drop empty platform remove function mfd: twl: Fix TWL6032 phy vbus detection mfd: pcf50633-adc: Fix potential memleak in pcf50633_adc_async_read() MAINTAINERS: Move MFD from a Supported to Maintaied state ...
2 parents 06e1a81 + 59c54c5 commit c2c23dc

38 files changed

+1479
-491
lines changed

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/bus/spi/devices/.../bmc_version
1+
What: /sys/bus/.../drivers/intel-m10-bmc/.../bmc_version
22
Date: June 2020
33
KernelVersion: 5.10
44
Contact: Xu Yilun <[email protected]>
55
Description: Read only. Returns the hardware build version of Intel
66
MAX10 BMC chip.
77
Format: "0x%x".
88

9-
What: /sys/bus/spi/devices/.../bmcfw_version
9+
What: /sys/bus/.../drivers/intel-m10-bmc/.../bmcfw_version
1010
Date: June 2020
1111
KernelVersion: 5.10
1212
Contact: Xu Yilun <[email protected]>
1313
Description: Read only. Returns the firmware version of Intel MAX10
1414
BMC chip.
1515
Format: "0x%x".
1616

17-
What: /sys/bus/spi/devices/.../mac_address
17+
What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_address
1818
Date: January 2021
1919
KernelVersion: 5.12
2020
Contact: Russ Weight <[email protected]>
@@ -25,7 +25,7 @@ Description: Read only. Returns the first MAC address in a block
2525
space.
2626
Format: "%02x:%02x:%02x:%02x:%02x:%02x".
2727

28-
What: /sys/bus/spi/devices/.../mac_count
28+
What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_count
2929
Date: January 2021
3030
KernelVersion: 5.12
3131
Contact: Russ Weight <[email protected]>

Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ properties:
3333
- description:
3434
For implementations of the EC connected through RPMSG.
3535
const: google,cros-ec-rpmsg
36+
- description:
37+
For implementations of the EC connected through UART.
38+
const: google,cros-ec-uart
3639

3740
controller-data: true
3841

@@ -187,6 +190,15 @@ allOf:
187190
properties:
188191
mediatek,rpmsg-name: false
189192

193+
- if:
194+
properties:
195+
compatible:
196+
not:
197+
contains:
198+
enum:
199+
- google,cros-ec-rpmsg
200+
- google,cros-ec-uart
201+
then:
190202
required:
191203
- reg
192204
- interrupts
@@ -299,4 +311,12 @@ examples:
299311
vdd-supply = <&pp3300_fp_mcu>;
300312
};
301313
};
314+
315+
# Example for UART
316+
- |
317+
serial {
318+
cros-ec {
319+
compatible = "google,cros-ec-uart";
320+
};
321+
};
302322
...
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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,bbnsm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP Battery-Backed Non-Secure Module
8+
9+
maintainers:
10+
- Jacky Bai <[email protected]>
11+
12+
description: |
13+
NXP BBNSM serves as non-volatile logic and storage for the system.
14+
it Intergrates RTC & ON/OFF control.
15+
The RTC can retain its state and continues counting even when the
16+
main chip is power down. A time alarm is generated once the most
17+
significant 32 bits of the real-time counter match the value in the
18+
Time Alarm register.
19+
The ON/OFF logic inside the BBNSM allows for connecting directly to
20+
a PMIC or other voltage regulator device. both smart PMIC mode and
21+
Dumb PMIC mode supported.
22+
23+
properties:
24+
compatible:
25+
items:
26+
- enum:
27+
- nxp,imx93-bbnsm
28+
- const: syscon
29+
- const: simple-mfd
30+
31+
reg:
32+
maxItems: 1
33+
34+
rtc:
35+
type: object
36+
$ref: /schemas/rtc/rtc.yaml#
37+
38+
properties:
39+
compatible:
40+
enum:
41+
- nxp,imx93-bbnsm-rtc
42+
43+
interrupts:
44+
maxItems: 1
45+
46+
start-year: true
47+
48+
required:
49+
- compatible
50+
- interrupts
51+
52+
additionalProperties: false
53+
54+
pwrkey:
55+
type: object
56+
$ref: /schemas/input/input.yaml#
57+
58+
properties:
59+
compatible:
60+
enum:
61+
- nxp,imx93-bbnsm-pwrkey
62+
63+
interrupts:
64+
maxItems: 1
65+
66+
linux,code: true
67+
68+
required:
69+
- compatible
70+
- interrupts
71+
72+
additionalProperties: false
73+
74+
required:
75+
- compatible
76+
- reg
77+
- rtc
78+
- pwrkey
79+
80+
additionalProperties: false
81+
82+
examples:
83+
- |
84+
#include <dt-bindings/input/linux-event-codes.h>
85+
#include <dt-bindings/interrupt-controller/arm-gic.h>
86+
87+
bbnsm: bbnsm@44440000 {
88+
compatible = "nxp,imx93-bbnsm", "syscon", "simple-mfd";
89+
reg = <0x44440000 0x10000>;
90+
91+
bbnsm_rtc: rtc {
92+
compatible = "nxp,imx93-bbnsm-rtc";
93+
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
94+
};
95+
96+
bbnsm_pwrkey: pwrkey {
97+
compatible = "nxp,imx93-bbnsm-pwrkey";
98+
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
99+
linux,code = <KEY_POWER>;
100+
};
101+
};

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- qcom,pm8004
4545
- qcom,pm8005
4646
- qcom,pm8009
47+
- qcom,pm8010
4748
- qcom,pm8019
4849
- qcom,pm8028
4950
- qcom,pm8110
@@ -55,6 +56,10 @@ properties:
5556
- qcom,pm8350
5657
- qcom,pm8350b
5758
- qcom,pm8350c
59+
- qcom,pm8550
60+
- qcom,pm8550b
61+
- qcom,pm8550ve
62+
- qcom,pm8550vs
5863
- qcom,pm8841
5964
- qcom,pm8909
6065
- qcom,pm8916
@@ -71,10 +76,12 @@ properties:
7176
- qcom,pmi8998
7277
- qcom,pmk8002
7378
- qcom,pmk8350
79+
- qcom,pmk8550
7480
- qcom,pmm8155au
7581
- qcom,pmp8074
7682
- qcom,pmr735a
7783
- qcom,pmr735b
84+
- qcom,pmr735d
7885
- qcom,pms405
7986
- qcom,pmx55
8087
- qcom,pmx65

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ properties:
2828
- qcom,sm8150-tcsr
2929
- qcom,tcsr-apq8064
3030
- qcom,tcsr-apq8084
31+
- qcom,tcsr-ipq5332
3132
- qcom,tcsr-ipq6018
3233
- qcom,tcsr-ipq8064
3334
- qcom,tcsr-mdm9615
35+
- qcom,tcsr-msm8226
3436
- qcom,tcsr-msm8660
3537
- qcom,tcsr-msm8916
3638
- qcom,tcsr-msm8953

Documentation/devicetree/bindings/mfd/syscon.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
- allwinner,sun8i-h3-system-controller
3939
- allwinner,sun8i-v3s-system-controller
4040
- allwinner,sun50i-a64-system-controller
41+
- amd,pensando-elba-syscon
4142
- brcm,cru-clkset
4243
- freecom,fsg-cs2-system-controller
4344
- fsl,imx93-aonmix-ns-syscfg
@@ -46,10 +47,12 @@ properties:
4647
- hisilicon,hi6220-sramctrl
4748
- hisilicon,pcie-sas-subctrl
4849
- hisilicon,peri-subctrl
50+
- hpe,gxp-sysreg
4951
- intel,lgm-syscon
5052
- marvell,armada-3700-usb2-host-misc
5153
- mediatek,mt8135-pctl-a-syscfg
5254
- mediatek,mt8135-pctl-b-syscfg
55+
- mediatek,mt8365-syscfg
5356
- microchip,lan966x-cpu-syscon
5457
- microchip,sparx5-cpu-syscon
5558
- mstar,msc313-pmsleep
@@ -81,6 +84,9 @@ properties:
8184
on the device.
8285
enum: [1, 2, 4, 8]
8386

87+
resets:
88+
maxItems: 1
89+
8490
hwlocks:
8591
maxItems: 1
8692
description:

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10458,7 +10458,7 @@ S: Maintained
1045810458
F: Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
1045910459
F: Documentation/hwmon/intel-m10-bmc-hwmon.rst
1046010460
F: drivers/hwmon/intel-m10-bmc-hwmon.c
10461-
F: drivers/mfd/intel-m10-bmc.c
10461+
F: drivers/mfd/intel-m10-bmc*
1046210462
F: include/linux/mfd/intel-m10-bmc.h
1046310463

1046410464
INTEL MENLOW THERMAL DRIVER
@@ -14181,7 +14181,7 @@ F: drivers/media/i2c/mt9v111.c
1418114181

1418214182
MULTIFUNCTION DEVICES (MFD)
1418314183
M: Lee Jones <[email protected]>
14184-
S: Supported
14184+
S: Maintained
1418514185
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
1418614186
F: Documentation/devicetree/bindings/mfd/
1418714187
F: drivers/mfd/

drivers/extcon/extcon-intel-cht-wc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ static int cht_wc_extcon_probe(struct platform_device *pdev)
537537
cht_wc_extcon_set_5v_boost(ext, false);
538538
break;
539539
case INTEL_CHT_WC_LENOVO_YOGABOOK1:
540+
case INTEL_CHT_WC_LENOVO_YT3_X90:
540541
/* Do this first, as it may very well return -EPROBE_DEFER. */
541542
ret = cht_wc_extcon_get_role_sw_and_regulator(ext);
542543
if (ret)

drivers/fpga/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ config FPGA_MGR_VERSAL_FPGA
246246

247247
config FPGA_M10_BMC_SEC_UPDATE
248248
tristate "Intel MAX10 BMC Secure Update driver"
249-
depends on MFD_INTEL_M10_BMC
249+
depends on MFD_INTEL_M10_BMC_CORE
250250
select FW_LOADER
251251
select FW_UPLOAD
252252
help

0 commit comments

Comments
 (0)