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

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

Pull MFD updates from Lee Jones:
 "Core Frameworks:
   - Standardise MFD_CELL_* helpers

  New Drivers:
   - Add support for Acer Iconia Tab A500 Embedded Controller

  New Device Support:
   - Add support for ROHM BD9574MWF to BD9571MWV
   - Add support for Intel Alder Lake PCH-P PCI to LPSS
   - Add support for Intel Alder Lake PCH-S PCI to LPSS

  New Functionality:
   - Support ACPI enumeration; arizona

  Fix-ups:
   - Managed resources; bd9571mwv
   - DT additions/fix-ups; bd9571mwv, iqs62x, max8997, gateworks-gsc, ene-kb930
   - Convert to SPDX; bd9571mw
   - Fix return values/error handling; sunxi
   - Provide SOFTDEP; arizona
   - Make use of DIV_ROUND_UP; mcp-sa11x0
   - Use generic APIs; arizona
   - Add MAC address sysfs entries; intel-m10-bmc
   - Trivial: Coding-style fix-ups; iqs62x
   - Trivial: Remove superflouous code; iqs62x
   - Clear-up naming conventions; iqs62x

  Bug Fixes:
   - Fix 'pointer from integer' error; altera-sysmgr
   - Convert SGI_MFD_IOC3 from tristate to bool; Kconfig
   - Fix interrupt handling; gateworks-gsc
   - Extend required delay; iqs62x
   - Do not use I2C polling during calibration; iqs62x
   - Do no adjust clock frequency during calibration; iqs62x
   - Fix use-after-free; wm831x-auxad"

* tag 'mfd-next-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
  mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
  mfd: iqs62x: Do not change clock frequency during ATI
  mfd: iqs62x: Do not poll during ATI
  mfd: iqs62x: Increase interrupt handler return delay
  mfd: iqs62x: Rename regmap_config struct
  mfd: iqs62x: Remove unused bit mask
  mfd: iqs62x: Remove superfluous whitespace above fallthroughs
  mfd: intel-lpss: Add Intel Alder Lake PCH-S PCI IDs
  mfd: intel-m10-bmc: Expose MAC address and count
  mfd: Add driver for Embedded Controller found on Acer Iconia Tab A500
  dt-bindings: mfd: Add ENE KB930 Embedded Controller binding
  dt-bindings: mfd: gateworks-gsc: Add fan-tach mode
  mfd: intel-lpss: Add Intel Alder Lake PCH-P PCI IDs
  mfd: gateworks-gsc: Fix interrupt type
  mfd: Standardise MFD_CELL_* helper names
  mfd: mcp-sa11x0: Use DIV_ROUND_UP to calculate rw_timeout
  mfd: max8997: Add of_compatible to Extcon and Charger mfd_cell
  dt-bindings: mfd: Correct the node name of the panel LED
  mfd: sgi-ioc3: Turn Kconfig option into a bool
  mfd: altera-sysmgr: Fix physical address storing more
  ...
parents 4512d92b 26783d74

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

+21 −0
Original line number Diff line number Diff line
@@ -13,3 +13,24 @@ Contact: Xu Yilun <yilun.xu@intel.com> 
Description:	Read only. Returns the firmware version of Intel MAX10

		BMC chip.

		Format: "0x%x".



What:		/sys/bus/spi/devices/.../mac_address

Date:		January 2021

KernelVersion:  5.12

Contact:	Russ Weight <russell.h.weight@intel.com>

Description:	Read only. Returns the first MAC address in a block

		of sequential MAC addresses assigned to the board

		that is managed by the Intel MAX10 BMC. It is stored in

		FLASH storage and is mirrored in the MAX10 BMC register

		space.

		Format: "%02x:%02x:%02x:%02x:%02x:%02x".



What:		/sys/bus/spi/devices/.../mac_count

Date:		January 2021

KernelVersion:  5.12

Contact:	Russ Weight <russell.h.weight@intel.com>

Description:	Read only. Returns the number of sequential MAC

		addresses assigned to the board managed by the Intel

		MAX10 BMC. This value is stored in FLASH and is mirrored

		in the MAX10 BMC register space.

		Format: "%u".

Documentation/devicetree/bindings/mfd/bd9571mwv.txt

+2 −2
Original line number Diff line number Diff line 
* ROHM BD9571MWV Power Management Integrated Circuit (PMIC) bindings

* ROHM BD9571MWV/BD9574MWF Power Management Integrated Circuit (PMIC) bindings



Required properties:

 - compatible		: Should be "rohm,bd9571mwv".

 - compatible		: Should be "rohm,bd9571mwv" or "rohm,bd9574mwf".

 - reg			: I2C slave address.

 - interrupts		: The interrupt line the device is connected to.

 - interrupt-controller	: Marks the device node as an interrupt controller.

Documentation/devicetree/bindings/mfd/ene-kb930.yaml

0 → 100644
+65 −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/ene-kb930.yaml#

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



title: ENE KB930 Embedded Controller bindings



description: |

  This binding describes the ENE KB930 Embedded Controller attached to an

  I2C bus.



maintainers:

  - Dmitry Osipenko <digetx@gmail.com>



properties:

  compatible:

    items:

      - enum:

          - acer,a500-iconia-ec # Acer A500 Iconia tablet device

      - const: ene,kb930

  reg:

    maxItems: 1



  monitored-battery: true

  power-supplies: true

  system-power-controller: true



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    battery: battery-cell {

      compatible = "simple-battery";

      charge-full-design-microamp-hours = <3260000>;

      energy-full-design-microwatt-hours = <24000000>;

      operating-range-celsius = <0 40>;

    };



    mains: ac-adapter {

      compatible = "gpio-charger";

      charger-type = "mains";

      gpios = <&gpio 125 0>;

    };



    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      embedded-controller@58 {

        compatible = "acer,a500-iconia-ec", "ene,kb930";

        reg = <0x58>;



        system-power-controller;



        monitored-battery = <&battery>;

        power-supplies = <&mains>;

      };

    };



...

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

+2 −1
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ properties: 
                2 - scaled voltage based on an optional resistor divider

                    and optional offset

                3 - pre-scaled 16-bit voltage value

                4 - fan tach input to report RPM's

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

            enum: [0, 1, 2, 3]

            enum: [0, 1, 2, 3, 4]



          gw,voltage-divider-ohms:

            description: Values of resistors for divider on raw ADC input

Documentation/devicetree/bindings/mfd/iqs62x.yaml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ examples: 
    pwmleds {

            compatible = "pwm-leds";



            panel {

            led-1 {

                    pwms = <&iqs620a_pwm 0 1000000>;

                    max-brightness = <255>;

            };