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

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

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add support for TI TPS6594/TPS6593/LP8764 PMICs
   - Add support for Samsung RT5033 Battery Charger
   - Add support for Analog Devices MAX77540 and MAX77541 PMICs

  New Device Support:
   - Add support for SPI to Rockchip RK808 (and friends)
   - Add support for AXP192 PMIC to X-Powers AXP20X
   - Add support for AXP313a PMIC to X-Powers AXP20X
   - Add support for RK806 to Rockchip RK8XX

  Removed Device Support:
   - Removed MFD support for Richtek RT5033 Battery

  Fix-ups:
   - Remove superfluous code
   - Switch I2C drivers from .probe_new() to .probe()
   - Convert over to managed resources (devm_*(), etc)
   - Use dev_err_probe() for returning errors from .probe()
   - Add lots of Device Tree bindings / support
   - Improve cache efficiency by switching to Maple
   - Use own exported namespaces (NS)
   - Include missing and remove superfluous headers
   - Start using / convert to the new shutdown sys-off API
   - Trivial: variable / define renaming
   - Make use of of_property_read_reg() when requesting DT 'reg's

  Bug Fixes:
   - Fix chip revision readout due to incorrect data masking
   - Amend incorrect register and mask values used for charger state
   - Hide unused functionality at compile time
   - Fix resource leaks following error handling routines
   - Return correct error values and fix error handling in general
   - Repair incorrect device names - used for device matching
   - Remedy broken module auto-loading"

* tag 'mfd-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (51 commits)
  dt-bindings: mfd: max77541: Add ADI MAX77541/MAX77540
  iio: adc: max77541: Add ADI MAX77541 ADC Support
  regulator: max77541: Add ADI MAX77541/MAX77540 Regulator Support
  dt-bindings: regulator: max77541: Add ADI MAX77541/MAX77540 Regulator
  mfd: Switch two more drivers back to use struct i2c_driver::probe
  dt-bindings: mfd: samsung,s5m8767: Simplify excluding properties
  mfd: stmpe: Only disable the regulators if they are enabled
  mfd: max77541: Add ADI MAX77541/MAX77540 PMIC Support
  dt-bindings: mfd: gateworks-gsc: Remove unnecessary fan-controller nodes
  mfd: core: Use of_property_read_reg() to parse "reg"
  mfd: stmfx: Nullify stmfx->vdd in case of error
  mfd: stmfx: Fix error path in stmfx_chip_init
  mfd: intel-lpss: Add missing check for platform_get_resource
  mfd: stpmic1: Add PMIC poweroff via sys-off handler
  mfd: stpmic1: Fixup main control register and bits naming
  dt-bindings: mfd: qcom,tcsr: Add the compatible for IPQ8074
  mfd: tps65219: Add support for soft shutdown via sys-off API
  mfd: pm8008: Drop bogus i2c module alias
  mfd: pm8008: Fix module autoloading
  mfd: tps65219: Add GPIO cell instance
  ...
parents 99bdeae2 b05740d7

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> 
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Lee Jones <lee@kernel.org> <joneslee@google.com>

Lee Jones <lee@kernel.org> <lee.jones@canonical.com>

Lee Jones <lee@kernel.org> <lee.jones@linaro.org>

Lee Jones <lee@kernel.org> <lee@ubuntu.com>

Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonard Göhrs <l.goehrs@pengutronix.de>

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

0 → 100644
+68 −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/adi,max77541.yaml#

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



title: MAX77540/MAX77541 PMIC from ADI



maintainers:

  - Okan Sahin <okan.sahin@analog.com>



description: |

  MAX77540 is a Power Management IC with 2 buck regulators.



  MAX77541 is a Power Management IC with 2 buck regulators and 1 ADC.



properties:

  compatible:

    enum:

      - adi,max77540

      - adi,max77541



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  regulators:

    $ref: /schemas/regulator/adi,max77541-regulator.yaml#



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@69 {

            compatible = "adi,max77541";

            reg = <0x69>;

            interrupt-parent = <&gpio>;

            interrupts = <16 IRQ_TYPE_EDGE_FALLING>;



            regulators {

                buck1 {

                    regulator-min-microvolt = <500000>;

                    regulator-max-microvolt = <5200000>;

                    regulator-boot-on;

                    regulator-always-on;

                };

                buck2 {

                    regulator-min-microvolt = <500000>;

                    regulator-max-microvolt = <5200000>;

                    regulator-boot-on;

                    regulator-always-on;

                };

            };

        };

    };

Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml

+0 −10
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ patternProperties: 
      compatible:

        const: gw,gsc-fan



      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



      reg:

        description: The fan controller base address

        maxItems: 1
@@ -135,8 +129,6 @@ patternProperties: 
    required:

      - compatible

      - reg

      - "#address-cells"

      - "#size-cells"



required:

  - compatible
@@ -194,8 +186,6 @@ examples: 
            };



            fan-controller@2c {

                #address-cells = <1>;

                #size-cells = <0>;

                compatible = "gw,gsc-fan";

                reg = <0x2c>;

            };

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

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ patternProperties: 
    type: object

    $ref: /schemas/nvmem/qcom,spmi-sdam.yaml#



  "phy@[0-9a-f]+$":

    type: object

    $ref: /schemas/phy/qcom,snps-eusb2-repeater.yaml#



  "pon@[0-9a-f]+$":

    type: object

    $ref: /schemas/power/reset/qcom,pon.yaml#

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

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

          - qcom,tcsr-ipq6018

          - qcom,tcsr-ipq8064

          - qcom,tcsr-ipq8074

          - qcom,tcsr-ipq9574

          - qcom,tcsr-mdm9615

          - qcom,tcsr-msm8226