diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 14:17:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 14:17:08 -0700 |
commit | b0a53b4f3f3df6b9da31f2e406da8a490122c807 (patch) | |
tree | 0b2802004ccebf27f3135869752120bbc44e1456 /include | |
parent | 8874d92b579bf86f61f044ab43a4cd961d112269 (diff) | |
parent | 91dba615c3431daf0132349812f6adc83e123eaf (diff) |
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
...
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/88pm80x.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/ds1wm.h | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h index def5df6e74bf..551ef1c367d6 100644 --- a/include/linux/mfd/88pm80x.h +++ b/include/linux/mfd/88pm80x.h @@ -294,7 +294,7 @@ struct pm80x_chip { struct i2c_client *client; struct i2c_client *companion; struct regmap *regmap; - struct regmap_irq_chip *regmap_irq_chip; + const struct regmap_irq_chip *regmap_irq_chip; struct regmap_irq_chip_data *irq_data; int type; int irq; diff --git a/include/linux/mfd/ds1wm.h b/include/linux/mfd/ds1wm.h deleted file mode 100644 index 43dfca1c9702..000000000000 --- a/include/linux/mfd/ds1wm.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* MFD cell driver data for the DS1WM driver - * - * to be defined in the MFD device that is - * using this driver for one of his sub devices - */ - -struct ds1wm_driver_data { - int active_high; - int clock_rate; - /* in milliseconds, the amount of time to - * sleep following a reset pulse. Zero - * should work if your bus devices recover - * time respects the 1-wire spec since the - * ds1wm implements the precise timings of - * a reset pulse/presence detect sequence. - */ - unsigned int reset_recover_delay; - - /* Say 1 here for big endian Hardware - * (only relevant with bus-shift > 0 - */ - bool is_hw_big_endian; - - /* left shift of register number to get register address offsett. - * Only 0,1,2 allowed for 8,16 or 32 bit bus width respectively - */ - unsigned int bus_shift; -}; |