Commit b0a53b4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 8874d92b 91dba615

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

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ properties: 
  "#pwm-cells":

    const: 3



patternProperties:

  "-hog(-[0-9]+)?$":

    type: object



    required:

      - gpio-hog



required:

  - compatible

  - reg

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
          - qcom,msm8998-tcsr

          - qcom,qcm2290-tcsr

          - qcom,qcs404-tcsr

          - qcom,sa8775p-tcsr

          - qcom,sc7180-tcsr

          - qcom,sc7280-tcsr

          - qcom,sc8280xp-tcsr

Documentation/devicetree/bindings/mfd/syscon.yaml

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ select: 
          - rockchip,rk3368-qos

          - rockchip,rk3399-qos

          - rockchip,rk3568-qos

          - rockchip,rk3576-qos

          - rockchip,rk3588-qos

          - rockchip,rv1126-qos

          - st,spear1340-misc
@@ -113,6 +114,7 @@ select: 
          - ti,am625-dss-oldi-io-ctrl

          - ti,am62p-cpsw-mac-efuse

          - ti,am654-dss-oldi-io-ctrl

          - ti,j784s4-acspcie-proxy-ctrl

          - ti,j784s4-pcie-ctrl

          - ti,keystone-pllctrl

  required:
@@ -198,6 +200,7 @@ properties: 
          - rockchip,rk3368-qos

          - rockchip,rk3399-qos

          - rockchip,rk3568-qos

          - rockchip,rk3576-qos

          - rockchip,rk3588-qos

          - rockchip,rv1126-qos

          - st,spear1340-misc

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13636,7 +13636,7 @@ S: Maintained 
F:	Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml

F:	drivers/input/misc/88pm886-onkey.c

F:	drivers/mfd/88pm886.c

F:	drivers/regulators/88pm886-regulator.c

F:	drivers/regulator/88pm886-regulator.c

F:	include/linux/mfd/88pm886.h









MARVELL ARMADA 3700 PHY DRIVERS
































drivers/mfd/88pm800.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -391,7 +391,7 @@ static void device_irq_exit_800(struct pm80x_chip *chip)







	regmap_del_irq_chip(chip->irq, chip->irq_data);









}



















static struct regmap_irq_chip pm800_irq_chip = {









static const struct regmap_irq_chip pm800_irq_chip = {









	.name = "88pm800",









	.irqs = pm800_irqs,









	.num_irqs = ARRAY_SIZE(pm800_irqs),