Skip to content

Commit b0a53b4

Browse files
committed
Merge tag 'mfd-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: - Added support for the Analog Devices ADP5585 GPIO and PWM functions - Added parsing of GPIO hogs for the ADP5585 - Fixed module autoloading in the MAX14577 driver - Simplified and cleaned up the CROS_EC driver - Made the Lenovo Yoga Tab 3 X90F DMI match less strict in the INTEL_SOC_PMIC_CHTWC driver - Added support for the RK806 PMIC on the I2C bus - Removed the remaining header file for the DS1WM driver - Added compatible strings for various devices in the device tree bindings - Fixed a comma-related issue in the 88PM860X_CORE driver - Constified read-only regmap structs in various drivers - Used scoped variables with memory allocators to simplify error paths in the MT6360 and SYSCON drivers - Added Intel Arrow Lake-H and Panther Lake LPSS PCI IDs * tag 'mfd-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (44 commits) mfd: atc260x: Convert a bunch of commas to semicolons dt-bindings: mfd: qcom,tcsr: Add compatible for sa8775p mfd: intel-lpss: Add Intel Panther Lake LPSS PCI IDs mfd: intel-lpss: Add Intel Arrow Lake-H LPSS PCI IDs dt-bindings: mfd: syscon: Add rk3576 QoS register compatible dt-bindings: mfd: adp5585: Add parsing of hogs mfd: tc3589x: Drop vendorless compatible string from match table mfd: qcom-spmi-pmic: Use for_each_child_of_node_scoped() mfd: max77620: Use for_each_child_of_node_scoped() mfd: intel_soc_pmic_chtwc: Make Lenovo Yoga Tab 3 X90F DMI match less strict mfd: cros_ec: Update module description mfd: cros_ec: Simplify and clean-up cros_ec_dev_init() mfd: max14577: Provide MODULE_DEVICE_TABLE() to fix module autoloading mfd: rk8xx: Add support for rk806 on i2c bus dt-bindings: mfd: syscon: Add ti,j784s4-acspcie-proxy-ctrl compatible mfd: ds1wm: Remove remaining header file MAINTAINERS: Repair file entry in MARVELL 88PM886 PMIC DRIVER mfd: 88pm860x-core: Convert comma to semicolon mfd: syscon: Use scoped variables with memory allocators to simplify error paths mfd: mt6360: Use scoped variables with memory allocators to simplify error paths ...
2 parents 8874d92 + 91dba61 commit b0a53b4

Some content is hidden

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

44 files changed

+163
-139
lines changed

Documentation/devicetree/bindings/mfd/adi,adp5585.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ properties:
4242
"#pwm-cells":
4343
const: 3
4444

45+
patternProperties:
46+
"-hog(-[0-9]+)?$":
47+
type: object
48+
49+
required:
50+
- gpio-hog
51+
4552
required:
4653
- compatible
4754
- reg

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- qcom,msm8998-tcsr
2222
- qcom,qcm2290-tcsr
2323
- qcom,qcs404-tcsr
24+
- qcom,sa8775p-tcsr
2425
- qcom,sc7180-tcsr
2526
- qcom,sc7280-tcsr
2627
- qcom,sc8280xp-tcsr

Documentation/devicetree/bindings/mfd/syscon.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ select:
103103
- rockchip,rk3368-qos
104104
- rockchip,rk3399-qos
105105
- rockchip,rk3568-qos
106+
- rockchip,rk3576-qos
106107
- rockchip,rk3588-qos
107108
- rockchip,rv1126-qos
108109
- st,spear1340-misc
@@ -113,6 +114,7 @@ select:
113114
- ti,am625-dss-oldi-io-ctrl
114115
- ti,am62p-cpsw-mac-efuse
115116
- ti,am654-dss-oldi-io-ctrl
117+
- ti,j784s4-acspcie-proxy-ctrl
116118
- ti,j784s4-pcie-ctrl
117119
- ti,keystone-pllctrl
118120
required:
@@ -198,6 +200,7 @@ properties:
198200
- rockchip,rk3368-qos
199201
- rockchip,rk3399-qos
200202
- rockchip,rk3568-qos
203+
- rockchip,rk3576-qos
201204
- rockchip,rk3588-qos
202205
- rockchip,rv1126-qos
203206
- st,spear1340-misc

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13636,7 +13636,7 @@ S: Maintained
1363613636
F: Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml
1363713637
F: drivers/input/misc/88pm886-onkey.c
1363813638
F: drivers/mfd/88pm886.c
13639-
F: drivers/regulators/88pm886-regulator.c
13639+
F: drivers/regulator/88pm886-regulator.c
1364013640
F: include/linux/mfd/88pm886.h
1364113641

1364213642
MARVELL ARMADA 3700 PHY DRIVERS

drivers/mfd/88pm800.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static void device_irq_exit_800(struct pm80x_chip *chip)
391391
regmap_del_irq_chip(chip->irq, chip->irq_data);
392392
}
393393

394-
static struct regmap_irq_chip pm800_irq_chip = {
394+
static const struct regmap_irq_chip pm800_irq_chip = {
395395
.name = "88pm800",
396396
.irqs = pm800_irqs,
397397
.num_irqs = ARRAY_SIZE(pm800_irqs),

drivers/mfd/88pm805.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static const struct mfd_cell codec_devs[] = {
7373
},
7474
};
7575

76-
static struct regmap_irq pm805_irqs[] = {
76+
static const struct regmap_irq pm805_irqs[] = {
7777
/* INT0 */
7878
[PM805_IRQ_LDO_OFF] = {
7979
.mask = PM805_INT1_HP1_SHRT,
@@ -163,7 +163,7 @@ static void device_irq_exit_805(struct pm80x_chip *chip)
163163
regmap_del_irq_chip(chip->irq, chip->irq_data);
164164
}
165165

166-
static struct regmap_irq_chip pm805_irq_chip = {
166+
static const struct regmap_irq_chip pm805_irq_chip = {
167167
.name = "88pm805",
168168
.irqs = pm805_irqs,
169169
.num_irqs = ARRAY_SIZE(pm805_irqs),

drivers/mfd/88pm860x-core.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ static void device_power_init(struct pm860x_chip *chip,
916916
power_devs[0].platform_data = pdata->power;
917917
power_devs[0].pdata_size = sizeof(struct pm860x_power_pdata);
918918
power_devs[0].num_resources = ARRAY_SIZE(battery_resources);
919-
power_devs[0].resources = &battery_resources[0],
919+
power_devs[0].resources = &battery_resources[0];
920920
ret = mfd_add_devices(chip->dev, 0, &power_devs[0], 1,
921921
&battery_resources[0], chip->irq_base, NULL);
922922
if (ret < 0)
@@ -925,7 +925,7 @@ static void device_power_init(struct pm860x_chip *chip,
925925
power_devs[1].platform_data = pdata->power;
926926
power_devs[1].pdata_size = sizeof(struct pm860x_power_pdata);
927927
power_devs[1].num_resources = ARRAY_SIZE(charger_resources);
928-
power_devs[1].resources = &charger_resources[0],
928+
power_devs[1].resources = &charger_resources[0];
929929
ret = mfd_add_devices(chip->dev, 0, &power_devs[1], 1,
930930
&charger_resources[0], chip->irq_base, NULL);
931931
if (ret < 0)
@@ -942,7 +942,7 @@ static void device_power_init(struct pm860x_chip *chip,
942942
pdata->chg_desc->charger_regulators =
943943
&chg_desc_regulator_data[0];
944944
pdata->chg_desc->num_charger_regulators =
945-
ARRAY_SIZE(chg_desc_regulator_data),
945+
ARRAY_SIZE(chg_desc_regulator_data);
946946
power_devs[3].platform_data = pdata->chg_desc;
947947
power_devs[3].pdata_size = sizeof(*pdata->chg_desc);
948948
ret = mfd_add_devices(chip->dev, 0, &power_devs[3], 1,
@@ -958,7 +958,7 @@ static void device_onkey_init(struct pm860x_chip *chip,
958958
int ret;
959959

960960
onkey_devs[0].num_resources = ARRAY_SIZE(onkey_resources);
961-
onkey_devs[0].resources = &onkey_resources[0],
961+
onkey_devs[0].resources = &onkey_resources[0];
962962
ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
963963
ARRAY_SIZE(onkey_devs), &onkey_resources[0],
964964
chip->irq_base, NULL);
@@ -972,7 +972,7 @@ static void device_codec_init(struct pm860x_chip *chip,
972972
int ret;
973973

974974
codec_devs[0].num_resources = ARRAY_SIZE(codec_resources);
975-
codec_devs[0].resources = &codec_resources[0],
975+
codec_devs[0].resources = &codec_resources[0];
976976
ret = mfd_add_devices(chip->dev, 0, &codec_devs[0],
977977
ARRAY_SIZE(codec_devs), &codec_resources[0], 0,
978978
NULL);

drivers/mfd/atc260x-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ int atc260x_match_device(struct atc260x *atc260x, struct regmap_config *regmap_c
235235

236236
mutex_init(atc260x->regmap_mutex);
237237

238-
regmap_cfg->lock = regmap_lock_mutex,
239-
regmap_cfg->unlock = regmap_unlock_mutex,
238+
regmap_cfg->lock = regmap_lock_mutex;
239+
regmap_cfg->unlock = regmap_unlock_mutex;
240240
regmap_cfg->lock_arg = atc260x->regmap_mutex;
241241

242242
return 0;

drivers/mfd/bd9571mwv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static const struct regmap_irq bd9571mwv_irqs[] = {
9393
BD9571MWV_INT_INTREQ_BKUP_TRG_INT),
9494
};
9595

96-
static struct regmap_irq_chip bd9571mwv_irq_chip = {
96+
static const struct regmap_irq_chip bd9571mwv_irq_chip = {
9797
.name = "bd9571mwv",
9898
.status_base = BD9571MWV_INT_INTREQ,
9999
.mask_base = BD9571MWV_INT_INTMASK,
@@ -159,7 +159,7 @@ static const struct regmap_config bd9574mwf_regmap_config = {
159159
.max_register = 0xff,
160160
};
161161

162-
static struct regmap_irq_chip bd9574mwf_irq_chip = {
162+
static const struct regmap_irq_chip bd9574mwf_irq_chip = {
163163
.name = "bd9574mwf",
164164
.status_base = BD9571MWV_INT_INTREQ,
165165
.mask_base = BD9571MWV_INT_INTMASK,

drivers/mfd/cros_ec_dev.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/*
3-
* cros_ec_dev - expose the Chrome OS Embedded Controller to user-space
3+
* ChromeOS Embedded Controller
44
*
55
* Copyright (C) 2014 Google, Inc.
66
*/
@@ -353,22 +353,17 @@ static int __init cros_ec_dev_init(void)
353353
{
354354
int ret;
355355

356-
ret = class_register(&cros_class);
356+
ret = class_register(&cros_class);
357357
if (ret) {
358358
pr_err(CROS_EC_DEV_NAME ": failed to register device class\n");
359359
return ret;
360360
}
361361

362-
/* Register the driver */
363362
ret = platform_driver_register(&cros_ec_dev_driver);
364-
if (ret < 0) {
363+
if (ret) {
365364
pr_warn(CROS_EC_DEV_NAME ": can't register driver: %d\n", ret);
366-
goto failed_devreg;
365+
class_unregister(&cros_class);
367366
}
368-
return 0;
369-
370-
failed_devreg:
371-
class_unregister(&cros_class);
372367
return ret;
373368
}
374369

@@ -382,6 +377,6 @@ module_init(cros_ec_dev_init);
382377
module_exit(cros_ec_dev_exit);
383378

384379
MODULE_AUTHOR("Bill Richardson <[email protected]>");
385-
MODULE_DESCRIPTION("Userspace interface to the Chrome OS Embedded Controller");
380+
MODULE_DESCRIPTION("ChromeOS Embedded Controller");
386381
MODULE_VERSION("1.0");
387382
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)