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

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

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add support for ROHM BD71828 PMICs and GPIOs
   - Add support for Qualcomm Aqstic Audio Codecs WCD9340 and WCD9341

  New Device Support:
   - Add support for BD71828 to BD70528 RTC driver
   - Add support for Intel's Jasper Lake to LPSS PCI

  New Functionality:
   - Add support for Power Key to ROHM BD71828
   - Add support for Clocks to ROHM BD71828
   - Add support for GPIOs to Dialog DA9062
   - Add support for USB PD Notify to ChromiumOS EC
   - Allow callers to specify args when requesting regmap lookup; syscon

  Fix-ups:
   - Improve error handling and sanity checking; atmel-hlcdc, dln2
   - Device Tree support/documentation; bd71828, da9062, xylon,logicvc,
     ab8500, max14577, atmel-usart
   - Match devices using platform IDs; bd7xxxx
   - Refactor BD718x7 regulator component; bd718x7-regulator
   - Use standard interfaces/helpers; syscon, sm501
   - Trivial (whitespace, spelling, etc); ab8500-core, Kconfig
   - Remove unused code; db8500-prcmu, tqmx86
   - Wait until boot has finished before accessing registers;
     madera-core
   - Provide missing register value defaults; cs47l15-tables
   - Allow more time for hardware to reset; madera-core

  Bug Fixes:
   - Fix erroneous register values; rohm-bd70528
   - Fix register volatility; axp20x, rn5t618
   - Fix Kconfig dependencies; MFD_MAX77650
   - Fix incorrect compatible string; da9062-core
   - Fix syscon_regmap_lookup_by_phandle_args() stub; syscon"

* tag 'mfd-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (41 commits)
  mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy
  mfd: wcd934x: Add support to wcd9340/wcd9341 codec
  mfd: syscon: Add arguments support for syscon reference
  mfd: rn5t618: Mark ADC control register volatile
  dt-bindings: atmel-usart: Add microchip,sam9x60-{usart, dbgu}
  dt-bindings: atmel-usart: Remove wildcard
  mfd: cros_ec: Add cros-usbpd-notify subdevice
  mfd: da9062: Fix watchdog compatible string
  mfd: madera: Allow more time for hardware reset
  mfd: cs47l15: Add missing register default
  mfd: madera: Wait for boot done before accessing any other registers
  mfd: Kconfig: Rename Samsung to lowercase
  mfd: tqmx86: remove set but not used variable 'i2c_ien'
  mfd: dbx500-prcmu: Drop DSI pll clock functions
  mfd: dbx500-prcmu: Drop set_display_clocks()
  mfd: max77650: Select REGMAP_IRQ in Kconfig
  mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile
  mfd: ab8500: Fix ab8500-clk typo
  mfd: intel-lpss: Add Intel Jasper Lake PCI IDs
  dt-bindings: mfd: max14577: Add reference to max14040_battery.txt descriptions
  ...
parents d0fa9250 5312f321

Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml

0 → 100644
+52 −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/leds/rohm,bd71828-leds.yaml#

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



title: ROHM BD71828 Power Management Integrated Circuit LED driver



maintainers:

  - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>



description: |

  This module is part of the ROHM BD71828 MFD device. For more details

  see Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml.



  The LED controller is represented as a sub-node of the PMIC node on the device

  tree.



  The device has two LED outputs referred as GRNLED and AMBLED in data-sheet.



select: false



properties:

  compatible:

    const: rohm,bd71828-leds



patternProperties:

  "^led-[1-2]$":

    type: object

    description:

      Properties for a single LED.

    properties:

      #allOf:

        #- $ref: "common.yaml#"

      rohm,led-compatible:

        description: LED identification string

        allOf:

          - $ref: "/schemas/types.yaml#/definitions/string"

          - enum:

            - bd71828-ambled

            - bd71828-grnled

      function:

        description:

          Purpose of LED as defined in dt-bindings/leds/common.h

        $ref: "/schemas/types.yaml#/definitions/string"

      color:

        description:

          LED colour as defined in dt-bindings/leds/common.h

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



required:

  - compatible

Documentation/devicetree/bindings/mfd/ab8500.txt

+5 −3
Original line number Diff line number Diff line 
* AB8500 Multi-Functional Device (MFD)



Required parent device properties:

- compatible             : contains "stericsson,ab8500";

- compatible             : contains "stericsson,ab8500" or "stericsson,ab8505";

- interrupts             : contains the IRQ line for the AB8500

- interrupt-controller   : describes the AB8500 as an Interrupt Controller (has its own domain)

- #interrupt-cells       : should be 2, for 2-cell format
@@ -49,11 +49,13 @@ ab8500-charger : : vddadc : Charger interface 
			 : CH_WD_EXP		:	       : Charger watchdog detected

ab8500-gpadc             : HW_CONV_END          : vddadc       : Analogue to Digital Converter

                           SW_CONV_END          :              :

ab8500-gpio              :                      :              : GPIO Controller

ab8500-gpio              :                      :              : GPIO Controller (AB8500)

ab8505-gpio              :                      :              : GPIO Controller (AB8505)

ab8500-ponkey            : ONKEY_DBF            :              : Power-on Key

                           ONKEY_DBR            :              :

ab8500-pwm               :                      :              : Pulse Width Modulator

ab8500-regulator         :                      :              : Regulators

ab8500-regulator         :                      :              : Regulators (AB8500)

ab8505-regulator         :                      :              : Regulators (AB8505)

ab8500-rtc               : 60S                  :              : Real Time Clock

                         : ALARM                :              :

ab8500-sysctrl           :                      :              : System Control

Documentation/devicetree/bindings/mfd/atmel-usart.txt

+7 −4
Original line number Diff line number Diff line 
* Atmel Universal Synchronous Asynchronous Receiver/Transmitter (USART)



Required properties for USART:

- compatible: Should be "atmel,<chip>-usart" or "atmel,<chip>-dbgu"

  The compatible <chip> indicated will be the first SoC to support an

  additional mode or an USART new feature.

  For the dbgu UART, use "atmel,<chip>-dbgu", "atmel,<chip>-usart"

- compatible: Should be one of the following:

	- "atmel,at91rm9200-usart"

	- "atmel,at91sam9260-usart"

	- "microchip,sam9x60-usart"

	- "atmel,at91rm9200-dbgu", "atmel,at91rm9200-usart"

	- "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"

	- "microchip,sam9x60-dbgu", "microchip,sam9x60-usart"

- reg: Should contain registers location and length

- interrupts: Should contain interrupt

- clock-names: tuple listing input clock names.

Documentation/devicetree/bindings/mfd/da9062.txt

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ da9062-rtc : : Real-Time Clock 
da9062-onkey            :               : On Key

da9062-watchdog         :               : Watchdog Timer

da9062-thermal          :               : Thermal

da9062-gpio             :               : GPIOs



The DA9061 PMIC consists of:
@@ -38,6 +39,15 @@ Required properties: 
See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for

further information on IRQ bindings.



Optional properties:



- gpio-controller : Marks the device as a gpio controller.

- #gpio-cells     : Should be two. The first cell is the pin number and the

                    second cell is used to specify the gpio polarity.



See Documentation/devicetree/bindings/gpio/gpio.txt for further information on

GPIO bindings.



Sub-nodes:



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

Documentation/devicetree/bindings/mfd/max14577.txt

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ Battery Charger and SFOUT LDO output for powering USB devices. It is 
interfaced to host controller using I2C.



MAX77836 additionally contains PMIC (with two LDO regulators) and Fuel Gauge.

For the description of Fuel Gauge low SOC alert interrupt see:

../power/supply/max17040_battery.txt





Required properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE