Commit 27bc0782 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD updates from Lee Jones:
 "Core Frameworks:
   - Allow all MFD Cell properties to be filled in dynamically at
     runtime
   - Skip disabled device nodes and continue to look for subsequent
     devices

  New Device Support:
   - Add support for Lunar Lake-M PCI to Intel LPSS PCI
   - Add support for Denverton to Intel ICH LPC

  New Functionality:
   - Add support for Clocks to Texas Instruments TWL* Core
   - Add support for Interrupts to STMicroelectronics STM32 Timers

  Fix-ups:
   - Convert to new devm-* (managed) power-off API
   - Remove superfluous code
   - Bunch of Device Tree additions, conversions and adaptions
   - Simplify obtaining resources (memory, device data) using unified
     API helpers
   - Trivial coding-style / spelling type clean-ups
   - Constify / staticify changes
   - Expand or edit on existing documentation
   - Convert some Regmap configurations to use the Maple Tree cache
   - Apply new __counted_by() annotation to several data structures
     containing flexible arrays
   - Replace strncpy() with strscpy()

  Bug Fixes:
   - Remove double put creating reference imbalances
   - Ensure headphone/lineout detection gets set when booting with ACPI"

* tag 'mfd-next-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (73 commits)
  mfd: lpc_ich: Mark *_gpio_offsets data with const
  spmi: rename spmi device lookup helper
  spmi: document spmi_device_from_of() refcounting
  dt-bindings: mfd: armltd: Move Arm board syscon's to separate schema
  mfd: rk8xx: Add support for RK806 power off
  mfd: rk8xx: Add support for standard system-power-controller property
  dt-bindings: mfd: rk806: Allow system-power-controller property
  dt-bindings: mfd: rk8xx: Deprecate rockchip,system-power-controller
  dt-bindings: mfd: max8925: Convert to DT schema format
  mfd: Use i2c_get_match_data() in a selection of drivers
  mfd: Use device_get_match_data() in a bunch of drivers
  mfd: mc13xxx-spi/wm831x-spi: Use spi_get_device_match_data()
  mfd: motorola-cpcap: Drop unnecessary of_match_device() call
  mfd: arizona-spi: Set pdata.hpdet_channel for ACPI enumerated devs
  mfd: qcom-spmi-pmic: Switch to EXPORT_SYMBOL_GPL()
  mfd: qcom-spmi-pmic: Fix revid implementation
  mfd: qcom-spmi-pmic: Fix reference leaks in revid helper
  mfd: intel-m10-bmc: Change contact for ABI docs
  mfd: max8907: Convert to use maple tree register cache
  mfd: max77686: Convert to use maple tree register cache
  ...
parents edd8e84a 2b481822

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Description: Read only. Returns the firmware version of Intel MAX10 
What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_address

Date:		January 2021

KernelVersion:  5.12

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

Contact:	Peter Colberg <peter.colberg@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
@@ -28,7 +28,7 @@ Description: Read only. Returns the first MAC address in a block 
What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_count

Date:		January 2021

KernelVersion:  5.12

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

Contact:	Peter Colberg <peter.colberg@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

Documentation/devicetree/bindings/arm/arm,integrator.yaml

+0 −39
Original line number Diff line number Diff line
@@ -40,45 +40,6 @@ properties: 
        items:

          - const: arm,integrator-sp



  core-module@10000000:

    type: object

    description: the root node in the Integrator platforms must contain

      a core module child node. They are always at physical address

      0x10000000 in all the Integrator variants.

    properties:

      compatible:

        items:

          - const: arm,core-module-integrator

          - const: syscon

          - const: simple-mfd

      reg:

        maxItems: 1



    required:

      - compatible

      - reg



patternProperties:

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

    description: All Integrator boards must provide a system controller as a

      node in the root of the device tree.

    type: object

    properties:

      compatible:

        items:

          - enum:

              - arm,integrator-ap-syscon

              - arm,integrator-cp-syscon

              - arm,integrator-sp-syscon

          - const: syscon

      reg:

        maxItems: 1



    required:

      - compatible

      - reg





required:

  - compatible

  - core-module@10000000

Documentation/devicetree/bindings/arm/arm,realview.yaml

+0 −37
Original line number Diff line number Diff line
@@ -75,43 +75,6 @@ properties: 
        type: object

        description: All RealView boards must provide a syscon system controller

          node inside the soc node.

        properties:

          compatible:

            oneOf:

              - items:

                  - const: arm,realview-eb11mp-revb-syscon

                  - const: arm,realview-eb-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-eb11mp-revc-syscon

                  - const: arm,realview-eb-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-eb-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-pb1176-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-pb11mp-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-pba8-syscon

                  - const: syscon

                  - const: simple-mfd

              - items:

                  - const: arm,realview-pbx-syscon

                  - const: syscon

                  - const: simple-mfd



        required:

          - compatible

          - reg



    required:

      - compatible

Documentation/devicetree/bindings/arm/arm,versatile.yaml

+8 −32
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ description: |+ 
  with various pluggable interface boards, in essence the Versatile PB version

  is a superset of the Versatile AB version.



  The root node in the Versatile platforms must contain a core module child

  node. They are always at physical address 0x10000000 in all the Versatile

  variants.



  When fitted with the IB2 Interface Board, the Versatile AB will present an

  optional system controller node which controls the extra peripherals on the

  interface board.



properties:

  $nodename:

    const: '/'
@@ -32,38 +40,6 @@ properties: 
        items:

          - const: arm,versatile-pb



  core-module@10000000:

    type: object

    description: the root node in the Versatile platforms must contain

      a core module child node. They are always at physical address

      0x10000000 in all the Versatile variants.

    properties:

      compatible:

        items:

          - const: arm,core-module-versatile

          - const: syscon

          - const: simple-mfd

      reg:

        maxItems: 1



    required:

      - compatible

      - reg



patternProperties:

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

    type: object

    description: When fitted with the IB2 Interface Board, the Versatile

      AB will present an optional system controller node which controls the

      extra peripherals on the interface board.

    properties:

      compatible:

        contains:

          const: arm,versatile-ib2-syscon

    required:

      - compatible

      - reg



required:

  - compatible

  - core-module@10000000

Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt

+1 −1
Original line number Diff line number Diff line 
Texas Instruments TWL family (twl4030) pwrbutton module



This module is part of the TWL4030. For more details about the whole

chip see Documentation/devicetree/bindings/mfd/twl-family.txt.

chip see Documentation/devicetree/bindings/mfd/ti,twl.yaml.



This module provides a simple power button event via an Interrupt.