Commit 7406fd75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add support for Ampere Computing SMpro
   - Add support for TI TPS65219 PMIC

  New Functionality:
   - Add support for multiple devices of the same type; rk808

  Fix-ups:
   - Convert a bunch of I2C class drivers over to .probe_new()
   - Remove superfluous includes; mc13xxx-*, palmas, timberdale
   - Use correct includes for GPIO handling; madera-core
   - Convert to GPIOD; twl6040
   - Remove unused platform data handling; twl6040
   - Device Tree changes; many
   - Remove unused drivers; dm355evm_msp, davinci_voicecodec, htc-i2cpld
   - Add support for modules; palmas
   - Enable COMPILE_TEST support; intel_soc_pmic*
   - Trivial: spelling / whitespace fixes; mc13xxx-spi
   - Replace old PM helpers with new ones; many
   - Convert deprecated mask_invert usage to unmask_base; many
   - Use devm_*() calls; qcom_rpm
   - MAINTAINER fix-ups
   - Make use of improved / replaced APIs; palmas, fsl-imx25-tsadc,
     stm32-lptimer, qcom_rpm, rohm-*

  Bug Fixes:
   - Add bounds / error checking; mt6360-core
   - No sleeping inside critical sections; axp20x
   - Fix missing dependencies; ROHM_BD957XMUF
   - Repair error paths; qcom-pm8008"

* tag 'mfd-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (161 commits)
  dt-bindings: mfd: da9062: Correct file name for watchdog
  mfd: pm8008: Fix return value check in pm8008_probe()
  mfd: rohm: Use dev_err_probe()
  mfd: Drop obsolete dependencies on COMPILE_TEST
  dt-bindings: mfd: da9062: Move IRQ to optional properties
  mfd: qcom_rpm: Use devm_of_platform_populate() to simplify code
  mfd: qcom_rpm: Fix an error handling path in qcom_rpm_probe()
  mfd: stm32-lptimer: Use devm_platform_get_and_ioremap_resource()
  mfd: rohm-bd9576: Convert to i2c's .probe_new()
  mfd: fsl-imx25-tsadc: Use devm_platform_get_and_ioremap_resource()
  dt-bindings: Fix maintainer email for a few ROHM ICs
  mfd: palmas: Use device_get_match_data() to simplify the code
  Input: Add tps65219 interrupt driven powerbutton
  mfd: tps65219: Add driver for TI TPS65219 PMIC
  mfd: bd957x: Fix Kconfig dependency on REGMAP_IRQ
  mfd: wcd934x: Convert irq chip to config regs
  mfd: tps65090: Replace irqchip mask_invert with unmask_base
  mfd: sun4i-gpadc: Replace irqchip mask_invert with unmask_base
  mfd: stpmic1: Fix swapped mask/unmask in irq chip
  mfd: sprd-sc27xx-spi: Replace irqchip mask_invert with unmask_base
  ...
parents 7c084612 37fecbb8

Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: ROHM BD71828 Power Management Integrated Circuit LED driver



maintainers:

  - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>

  - Matti Vaittinen <mazziesaccount@gmail.com>



description: |

  This module is part of the ROHM BD71828 MFD device. For more details

Documentation/devicetree/bindings/mfd/ampere,smpro.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/mfd/ampere,smpro.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Ampere Altra SMPro firmware driver



maintainers:

  - Quan Nguyen <quan@os.amperecomputing.com>



description: |

  Ampere Altra SMPro firmware may contain different blocks like hardware

  monitoring, error monitoring and other miscellaneous features.



properties:

  compatible:

    enum:

      - ampere,smpro



  reg:

    description:

      I2C device address.

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        smpro@4f {

            compatible = "ampere,smpro";

            reg = <0x4f>;

        };

    };

Documentation/devicetree/bindings/mfd/brcm,twd.yaml

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ properties: 
    const: 1



patternProperties:

  '^timer@[a-f0-9]+$':

    $ref: /schemas/timer/brcm,bcmbca-timer.yaml



  '^watchdog@[a-f0-9]+$':

    $ref: /schemas/watchdog/brcm,bcm7038-wdt.yaml
@@ -54,6 +57,11 @@ examples: 
        #address-cells = <1>;

        #size-cells = <1>;



        timer@0 {

            compatible = "brcm,bcm63138-timer";

            reg = <0x0 0x28>;

        };



        watchdog@28 {

            compatible = "brcm,bcm7038-wdt";

            reg = <0x28 0x8>;

Documentation/devicetree/bindings/mfd/da9062.txt

+7 −6
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ Required properties: 
    "dlg,da9061" for DA9061

- reg : Specifies the I2C slave address (this defaults to 0x58 but it can be

  modified to match the chip's OTP settings).

- interrupts : IRQ line information.

- interrupt-controller



See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for

further information on IRQ bindings.



Optional properties:
@@ -48,6 +43,12 @@ Optional properties: 
See Documentation/devicetree/bindings/gpio/gpio.txt for further information on

GPIO bindings.



- interrupts : IRQ line information.

- interrupt-controller



See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for

further information on IRQ bindings.



Sub-nodes:



- regulators : This node defines the settings for the LDOs and BUCKs.
@@ -85,7 +86,7 @@ Sub-nodes: 


- onkey : See ../input/da9062-onkey.txt



- watchdog: See ../watchdog/da9062-watchdog.txt

- watchdog: See ../watchdog/da9062-wdt.txt



- thermal : See ../thermal/da9062-thermal.txt

Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ maintainers: 
description: |

  The Ocelot ethernet switch family contains chips that have an internal CPU

  (VSC7513, VSC7514) and chips that don't (VSC7511, VSC7512). All switches have

  the option to be controlled externally, which is the purpose of this driver.

  the option to be controlled externally via external interfaces like SPI or

  PCIe.



  The switch family is a multi-port networking switch that supports many

  interfaces. Additionally, the device can perform pin control, MDIO buses, and
@@ -61,7 +62,6 @@ required: 
  - reg

  - '#address-cells'

  - '#size-cells'

  - spi-max-frequency



additionalProperties: false