Commit 1658d624 authored by Lee Jones's avatar Lee Jones
Browse files

Merge tags 'ib-mfd-clk-gpio-regulator-rtc-v5.13', 'ib-mfd-extcon-v5.13',... 

Merge tags 'ib-mfd-clk-gpio-regulator-rtc-v5.13', 'ib-mfd-extcon-v5.13', 'ib-mfd-input-v5.13-1', 'ib-mfd-platform-x86-v5.13', 'ib-mfd-power-v5.13', 'ib-mfd-pwm-rtc-v5.13-1' and 'ib-regulator-list-ramp-helpers-v5.13' into ibs-for-mfd-merged

Immutable branch between MFD, Clock, GPIO, Regulator and RTC due for the v5.13 merge window

Immutable branch between MFD and Extcon due for the v5.13 merge window

Immutable branch between MFD and Input due for the v5.13 merge window

Immutable branch between MFD and Platform/x86 due for the v5.13 merge window

Immutable branch between MFD and Power due for the v5.13 merge window

Immutable branch between MFD, PWM and RTC due for the v5.13 merge window
parents 5a8a64d9 a908a716 eac013a0 aa47ad3f ee0975c3 edbda8f7 fb8fee9e

Documentation/ABI/testing/sysfs-fs-xfs

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Contact: xfs@oss.sgi.com 
Description:

		The current state of the log write grant head. It

		represents the total log reservation of all currently

		oustanding transactions, including regrants due to

		outstanding transactions, including regrants due to

		rolling transactions. The grant head is exported in

		"cycle:bytes" format.

Users:		xfstests

Documentation/devicetree/bindings/input/input.yaml

+7 −0
Original line number Diff line number Diff line
@@ -34,4 +34,11 @@ properties: 
      specify this property.

    $ref: /schemas/types.yaml#/definitions/uint32



  reset-time-sec:

    description:

      Duration in seconds which the key should be kept pressed for device to

      reset automatically. Device with key pressed reset feature can specify

      this property.

    $ref: /schemas/types.yaml#/definitions/uint32



additionalProperties: true

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - enum:

              - ingenic,jz4775-intc

              - ingenic,jz4770-intc

              - ingenic,jz4760b-intc

          - const: ingenic,jz4760-intc

      - items:

          - const: ingenic,x1000-intc

Documentation/devicetree/bindings/mfd/actions,atc260x.yaml

0 → 100644
+183 −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/actions,atc260x.yaml#

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



title: Actions Semi ATC260x Power Management IC bindings



maintainers:

  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

  - Cristian Ciocaltea <cristian.ciocaltea@gmail.com>



description: |

  ATC260x series PMICs integrates Audio Codec, Power Management, RTC, IR

  and GPIO controller blocks. Currently only the PM related functionalities

  (i.e. regulators and system power-off/reboot) for the ATC2603C and ATC2609A

  chip variants are supported.

  ATC2603C includes 3 programmable DC-DC converters, 9 programmable LDO

  regulators and 1 fixed LDO regulator.

  ATC2609A includes 5 programmable DC-DC converters and 10 programmable LDO

  regulators.



allOf:

  - $ref: ../input/input.yaml



properties:

  compatible:

    enum:

      - actions,atc2603c

      - actions,atc2609a



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  reset-time-sec:

    description: |

      Duration in seconds which the key should be kept pressed for device

      to reset automatically. The hardware default is 8. Use 0 to disable

      this functionality.

    enum: [0, 6, 8, 10, 12]



  regulators:

    type: object

    description: |

      List of child nodes specifying the regulators, depending on chip variant:

      * ATC2603C: dcdc[1-3], ldo[1-3,5-8,11,12], switchldo1

      * ATC2609A: dcdc[0-4], ldo[0-9]



    properties:

      compatible:

        enum:

          - actions,atc2603c-regulator

          - actions,atc2609a-regulator



      switchldo1:

        type: object

        $ref: ../regulator/regulator.yaml



        properties:

          regulator-name: true

          regulator-boot-on: true

          regulator-always-on: true

          regulator-min-microvolt: true

          regulator-max-microvolt: true

          regulator-allow-bypass: true

          regulator-active-discharge: true



        additionalProperties: false



    patternProperties:

      "^(dcdc[0-4]|ldo[0-9]|ldo1[1-2]|switchldo1)-supply$":

        description: ATC260x voltage regulators supplies



      "^(dcdc[0-4]|ldo[0-9]|ldo1[1-2])$":

        type: object

        $ref: ../regulator/regulator.yaml



        properties:

          regulator-name: true

          regulator-boot-on: true

          regulator-always-on: true

          regulator-min-microvolt: true

          regulator-max-microvolt: true

          regulator-allow-bypass: true



        additionalProperties: false



    allOf:

      - if:

          properties:

            compatible:

              contains:

                const: actions,atc2603c-regulator

        then:

          patternProperties:

            "^(dcdc[0,4]|ldo[0,4,9])(-supply)?$": false



            "^(ldo|dcdc)":

              properties:

                regulator-allow-bypass: false

      - if:

          properties:

            compatible:

              contains:

                const: actions,atc2609a-regulator

        then:

          patternProperties:

            "^(ldo1[1-2]|switchldo1)(-supply)?$": false



            "^(dcdc|ldo[3-9])":

              properties:

                regulator-allow-bypass: false



    required:

      - compatible



    additionalProperties: false



additionalProperties: false



required:

  - compatible

  - reg

  - interrupts



examples:

  - |

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

    i2c0 {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@65 {

            compatible = "actions,atc2603c";

            reg = <0x65>;

            interrupt-parent = <&sirq>;

            interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;



            reset-time-sec = <6>;



            regulators {

                compatible = "actions,atc2603c-regulator";



                dcdc1-supply = <&reg_5v0>;

                dcdc3-supply = <&reg_5v0>;

                ldo5-supply = <&reg_5v0>;

                switchldo1-supply = <&vcc>;



                vdd_cpu: dcdc1 {

                    regulator-name = "VDD_CPU";

                    regulator-min-microvolt = <700000>;

                    regulator-max-microvolt = <1400000>;

                    regulator-always-on;

                };



                vcc: dcdc3 {

                    regulator-name = "VCC";

                    regulator-min-microvolt = <2600000>;

                    regulator-max-microvolt = <3300000>;

                    regulator-always-on;

                };



                vcc_3v1: ldo5 {

                    regulator-name = "VCC_3V1";

                    regulator-min-microvolt = <2600000>;

                    regulator-max-microvolt = <3300000>;

                };



                sd_vcc: switchldo1 {

                    regulator-name = "SD_VCC";

                    regulator-min-microvolt = <3000000>;

                    regulator-max-microvolt = <3300000>;

                    regulator-always-on;

                    regulator-boot-on;

                };

            };

        };

    };



...

Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml

0 → 100644
+76 −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/netronix,ntxec.yaml#

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



title: Netronix Embedded Controller



maintainers:

  - Jonathan Neuschäfer <j.neuschaefer@gmx.net>



description: |

  This EC is found in e-book readers of multiple brands (e.g. Kobo, Tolino), and

  is typically implemented as a TI MSP430 microcontroller.



properties:

  compatible:

    const: netronix,ntxec



  reg:

    items:

      - description: The I2C address of the EC



  system-power-controller:

    type: boolean

    description: See Documentation/devicetree/bindings/power/power-controller.txt



  interrupts:

    minItems: 1

    description:

      The EC can signal interrupts via a GPIO line



  "#pwm-cells":

    const: 2

    description: |

      Number of cells in a PWM specifier.



      The following PWM channels are supported:

        - 0: The PWM channel controlled by registers 0xa1-0xa7



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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

    i2c {

            #address-cells = <1>;

            #size-cells = <0>;



            ec: embedded-controller@43 {

                    pinctrl-names = "default";

                    pinctrl-0 = <&pinctrl_ntxec>;



                    compatible = "netronix,ntxec";

                    reg = <0x43>;

                    system-power-controller;

                    interrupt-parent = <&gpio4>;

                    interrupts = <11 IRQ_TYPE_EDGE_FALLING>;

                    #pwm-cells = <2>;

            };

    };



    backlight {

            compatible = "pwm-backlight";

            pwms = <&ec 0 50000>;

            power-supply = <&backlight_regulator>;

    };



    backlight_regulator: regulator-dummy {

            compatible = "regulator-fixed";

            regulator-name = "backlight";

    };