Commit 613b2a82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD updates from Lee Jones:
 "Core Framework:
   - Change maintainer email address
   - Use acpi_dev_for_each_child() helper to walk the ACPI list

  New Device Support:
   - BCM2711 RPiVid ASB in Broadcom BCM2835
   - MT8195 dual-core RISC-V MCU in Chrome OS Embedded Controller
   - Regulator, RTC and Keys in MediaTek MT6357 PMIC
   - GPIO in X-Powers AXP20x PMIC
   - MT6331 and MT6332 in MediaTek MT6357 PMIC
   - Intel Meteor Lake-P PCI in Intel LPSS PCI

  New Functionality:
   - Add support for non-ACPI platforms; lpc_ich

  Fix-ups:
   - Use platform data instead of hard-coded values; bcm2835-pm
   - Make use of BIT/GENMASK macros; intel_soc_pmic_bxtwc
   - Use dev_err_probe() helper; intel_soc_pmic_chtwc,
     intel_soc_pmic_bxtwc
   - Use provided generic APIs / helpers; lpc_ich
   - Clean-up .remove() return values; asic3, t7l66xb, tc6387xb,
     tc6393xb
   - Use correct formatting specifiers; syscon
   - Replace sprintf() with sysfs_emit(); intel_soc_pmic_bxtwc
   - Automatically detect and fill USB endpoint pointers; dln2
   - Use more appropriate dev/platform/spi resources APIs;
     intel_soc_pmic_bxtwc
   - Make use of pm_sleep_ptr(); intel_soc_pmic_chtwc,
     intel_soc_pmic_bxtwc
   - Improve error handling; intel_soc_pmic_bxtwc
   - Use core driver API to create groups; intel_soc_pmic_bxtwc
   - Kconfig fix-ups; MFD_SUN6I_PRCM
   - Admin: whitespace/email addresses/etc; max77714, db8500-prcmu,
     ipaq-micro, intel_soc_pmic_bxtwc
   - Remove duplicate/unused code/functionality; lpc_ich, twl-core,
     qcom-pm8008, intel_soc_pmic_bxtwc
   - DT fix-ups / conversions; da9063, ti,j721e-system-controller,
     st,stm32-timers, mt6397, qcom,tcsr, mps,mp2629, qcom-pm8xxx,
     fsl,imx8qxp-csr

  Bug Fixes:
   - Fix of_node reference leak; max77620"

* tag 'mfd-next-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (49 commits)
  dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties'
  dt-bindings: mfd: st,stm32-timers: Correct 'resets' property name
  dt-bindings: mfd: syscon: Update Lee Jones' email address
  MAINTAINERS: Use Lee Jones' kernel.org address for Syscon submissions
  MAINTAINERS: Use Lee Jones' kernel.org address for MFD submissions
  mfd: sun6i-prcm: Update Kconfig description
  mfd: intel_soc_pmic_bxtwc: Fix spelling in the comment
  mfd: intel_soc_pmic_bxtwc: Drop unneeded casting
  mfd: intel_soc_pmic_bxtwc: Use sysfs_emit() instead of sprintf()
  mfd: intel_soc_pmic_bxtwc: Use bits.h macros for all masks
  mfd: intel_soc_pmic_bxtwc: Drop redundant ACPI_PTR()
  mfd: intel_soc_pmic_bxtwc: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc
  mfd: intel_soc_pmic_bxtwc: Extend use of temporary variable for struct device
  mfd: intel_soc_pmic_bxtwc: Use dev_err_probe()
  mfd: intel_soc_pmic_bxtwc: Convert to use platform_get/set_drvdata()
  mfd: intel_soc_pmic_bxtwc: Create sysfs attributes using core driver's facility
  mfd: intel_soc_pmic_bxtwc: Don't shadow error codes in show()/store()
  mfd: intel-lpss: Add Intel Meteor Lake-P PCI IDs
  mfd: mt6397: Add basic support for MT6331+MT6332 PMIC
  mfd: axp20x: Add AXP221/AXP223/AXP809 GPIO cells
  ...
parents 668c3c23 ae4ccaed

Documentation/devicetree/bindings/mfd/da9063.txt

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
* Dialog DA9063/DA9063L Power Management Integrated Circuit (PMIC)



DA9063 consists of a large and varied group of sub-devices (I2C Only):



Device                   Supply Names    Description

------                   ------------    -----------

da9063-regulator        :               : LDOs & BUCKs

da9063-onkey            :               : On Key

da9063-rtc              :               : Real-Time Clock (DA9063 only)

da9063-watchdog         :               : Watchdog



======



Required properties:



- compatible : Should be "dlg,da9063" or "dlg,da9063l"

- 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



Sub-nodes:



- regulators : This node defines the settings for the LDOs and BUCKs.

  The DA9063(L) regulators are bound using their names listed below:



    bcore1    : BUCK CORE1

    bcore2    : BUCK CORE2

    bpro      : BUCK PRO

    bmem      : BUCK MEM

    bio       : BUCK IO

    bperi     : BUCK PERI

    ldo1      : LDO_1	(DA9063 only)

    ldo2      : LDO_2	(DA9063 only)

    ldo3      : LDO_3

    ldo4      : LDO_4	(DA9063 only)

    ldo5      : LDO_5	(DA9063 only)

    ldo6      : LDO_6	(DA9063 only)

    ldo7      : LDO_7

    ldo8      : LDO_8

    ldo9      : LDO_9

    ldo10     : LDO_10	(DA9063 only)

    ldo11     : LDO_11



  The component follows the standard regulator framework and the bindings

  details of individual regulator device can be found in:

  Documentation/devicetree/bindings/regulator/regulator.txt



- rtc : This node defines settings for the Real-Time Clock associated with

  the DA9063 only. The RTC is not present in DA9063L. There are currently

  no entries in this binding, however compatible = "dlg,da9063-rtc" should

  be added if a node is created.



- onkey : This node defines the OnKey settings for controlling the key

  functionality of the device. The node should contain the compatible property

  with the value "dlg,da9063-onkey".



  Optional onkey properties:



  - dlg,disable-key-power : Disable power-down using a long key-press. If this

    entry exists the OnKey driver will remove support for the KEY_POWER key

    press. If this entry does not exist then by default the key-press

    triggered power down is enabled and the OnKey will support both KEY_POWER

    and KEY_SLEEP.



- watchdog : This node defines settings for the Watchdog timer associated

  with the DA9063 and DA9063L. The node should contain the compatible property

  with the value "dlg,da9063-watchdog".



  Optional watchdog properties:

  - dlg,use-sw-pm: Add this property to disable the watchdog during suspend.

  Only use this option if you can't use the watchdog automatic suspend

  function during a suspend (see register CONTROL_B).



Example:



	pmic0: da9063@58 {

		compatible = "dlg,da9063"

		reg = <0x58>;

		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;



		rtc {

			compatible = "dlg,da9063-rtc";

		};



		wdt {

			compatible = "dlg,da9063-watchdog";

		};



		onkey {

			compatible = "dlg,da9063-onkey";

			dlg,disable-key-power;

		};



		regulators {

			DA9063_BCORE1: bcore1 {

				regulator-name = "BCORE1";

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1570000>;

				regulator-min-microamp = <500000>;

				regulator-max-microamp = <2000000>;

				regulator-boot-on;

			};

			DA9063_LDO11: ldo11 {

				regulator-name = "LDO_11";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3600000>;

				regulator-boot-on;

			};

		};

	};

Documentation/devicetree/bindings/mfd/dlg,da9063.yaml

0 → 100644
+132 −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/dlg,da9063.yaml#

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



title: Dialog DA9063/DA9063L Power Management Integrated Circuit (PMIC)



maintainers:

  - Steve Twiss <stwiss.opensource@diasemi.com>



description: |

  For device-tree bindings of other sub-modules refer to the binding documents

  under the respective sub-system directories.



properties:

  compatible:

    enum:

      - dlg,da9063

      - dlg,da9063l



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  interrupt-controller: true



  "#interrupt-cells":

    const: 2



  dlg,use-sw-pm:

    type: boolean

    description:

      Disable the watchdog during suspend.

      Only use this option if you can't use the watchdog automatic suspend

      function during a suspend (see register CONTROL_B).



  watchdog:

    type: object

    $ref: /schemas/watchdog/watchdog.yaml#

    unevaluatedProperties: false

    properties:

      compatible:

        const: dlg,da9063-watchdog



  rtc:

    type: object

    $ref: /schemas/rtc/rtc.yaml#

    unevaluatedProperties: false

    properties:

      compatible:

        const: dlg,da9063-rtc



  onkey:

    type: object

    $ref: /schemas/input/input.yaml#

    unevaluatedProperties: false

    properties:

      compatible:

        const: dlg,da9063-onkey



      dlg,disable-key-power:

        type: boolean

        description: |

          Disable power-down using a long key-press.

          If this entry does not exist then by default the key-press triggered

          power down is enabled and the OnKey will support both KEY_POWER and

          KEY_SLEEP.



  regulators:

    type: object

    patternProperties:

      "^(ldo[1-11]|bcore[1-2]|bpro|bmem|bio|bperi)$":

        $ref: /schemas/regulator/regulator.yaml

        unevaluatedProperties: false



required:

  - compatible

  - reg

  - interrupts

  - interrupt-controller



additionalProperties: false



examples:

  - |

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

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;

      pmic@58 {

        compatible = "dlg,da9063";

        reg = <0x58>;

        #interrupt-cells = <2>;

        interrupt-parent = <&gpio6>;

        interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

        interrupt-controller;



        rtc {

          compatible = "dlg,da9063-rtc";

        };



        watchdog {

          compatible = "dlg,da9063-watchdog";

        };



        onkey {

          compatible = "dlg,da9063-onkey";

          dlg,disable-key-power;

        };



        regulators {

          regulator-bcore1 {

            regulator-name = "BCORE1";

            regulator-min-microvolt = <300000>;

            regulator-max-microvolt = <1570000>;

            regulator-min-microamp = <500000>;

            regulator-max-microamp = <2000000>;

            regulator-boot-on;

          };

          regulator-ldo11 {

            regulator-name = "LDO_11";

            regulator-min-microvolt = <900000>;

            regulator-max-microvolt = <3600000>;

            regulator-boot-on;

          };

        };

      };

    };

...

Documentation/devicetree/bindings/mfd/mps,mp2629.yaml

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ description: | 


properties:

  compatible:

    const: mps,mp2629

    enum:

      - mps,mp2629

      - mps,mp2733



  reg:

    maxItems: 1

Documentation/devicetree/bindings/mfd/mt6397.txt

+6 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ This document describes the binding for MFD device and its sub module. 
Required properties:

compatible:

	"mediatek,mt6323" for PMIC MT6323

	"mediatek,mt6331" for PMIC MT6331 and MT6332

	"mediatek,mt6358" for PMIC MT6358 and MT6366

	"mediatek,mt6359" for PMIC MT6359

	"mediatek,mt6397" for PMIC MT6397
@@ -29,6 +30,7 @@ Optional subnodes: 
- rtc

	Required properties: Should be one of follows

		- compatible: "mediatek,mt6323-rtc"

		- compatible: "mediatek,mt6331-rtc"

		- compatible: "mediatek,mt6358-rtc"

		- compatible: "mediatek,mt6397-rtc"

	For details, see ../rtc/rtc-mt6397.txt
@@ -52,8 +54,10 @@ Optional subnodes: 
	see ../leds/leds-mt6323.txt



- keys

	Required properties:

		- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys"

	Required properties: Should be one of the following

		- compatible: "mediatek,mt6323-keys"

		- compatible: "mediatek,mt6331-keys"

		- compatible: "mediatek,mt6397-keys"

	see ../input/mtk-pmic-keys.txt



- power-controller

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

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
QCOM Top Control and Status Register



Qualcomm devices have a set of registers that provide various control and status

functions for their peripherals.  This node is intended to allow access to these

registers via syscon.



Required properties:

- compatible:	Should contain:

		"qcom,tcsr-ipq6018", "syscon", "simple-mfd" for IPQ6018

		"qcom,tcsr-ipq8064", "syscon" for IPQ8064

		"qcom,tcsr-apq8064", "syscon" for APQ8064

		"qcom,tcsr-msm8660", "syscon" for MSM8660

		"qcom,tcsr-msm8953", "syscon" for MSM8953

		"qcom,tcsr-msm8960", "syscon" for MSM8960

		"qcom,tcsr-msm8974", "syscon" for MSM8974

		"qcom,tcsr-apq8084", "syscon" for APQ8084

		"qcom,tcsr-msm8916", "syscon" for MSM8916

- reg: Address range for TCSR registers



Example:

	tcsr: syscon@1a400000 {

		compatible = "qcom,tcsr-msm8960", "syscon";

		reg = <0x1a400000 0x100>;

	};