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

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

Pull MFD updates from Lee Jones:
 "Core Framework:
   - Document (kerneldoc) core mfd_add_devices() API

  New Drivers:
   - Altera SOCFPGA System Manager
   - Maxim MAX77650/77651 PMIC
   - Maxim MAX77663 PMIC
   - ST Multi-Function eXpander (STMFX)

  New Device Support:
   - LEDs support in Intel Cherry Trail Whiskey Cove PMIC
   - RTC support in SAMSUNG Electronics S2MPA01 PMIC
   - SAM9X60 support in Atmel HLCDC (High-end LCD Controller)
   - USB X-Powers AXP 8xx PMICs
   - Integrated Sensor Hub (ISH) in ChromeOS EC
   - USB PD Logger in ChromeOS EC
   - AXP223 in X-Powers AXP series PMICs
   - Power Supply in X-Powers AXP 803 PMICs
   - Comet Lake in Intel Low Power Subsystem
   - Fingerprint MCU in ChromeOS EC
   - Touchpad MCU in ChromeOS EC
   - Move TI LM3532 support to LED

  New Functionality:
   - max77650, max77620: Add/extend DT support
   - max77620 power-off
   - syscon clocking
   - croc_ec host sleep event

  Fix-ups:
   - Trivial; Formatting, spelling, etc; Kconfig, sec-core, ab8500-debugfs
   - Remove unused functionality; rk808, da9063-*
   - SPDX conversion; da9063-*, atmel-*,
   - Adapt/add new register definitions; cs47l35-tables, cs47l90-tables, imx6q-iomuxc-gpr
   - Fix-up DT bindings; ti-lmu, cirrus,lochnagar
   - Simply obtaining driver data; ssbi, t7l66xb, tc6387xb, tc6393xb

  Bug Fixes:
   - Fix incorrect defined values; max77620, da9063
   - Fix device initialisation; twl6040
   - Reset device on init; intel-lpss
   - Fix build warnings when !OF; sun6i-prcm
   - Register OF match tables; tps65912-spi
   - Fix DMI matching; intel_quark_i2c_gpio"

* tag 'mfd-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (65 commits)
  mfd: Use dev_get_drvdata() directly
  mfd: cros_ec: Instantiate properly CrOS Touchpad MCU device
  mfd: cros_ec: Instantiate properly CrOS FP MCU device
  mfd: cros_ec: Update the EC feature codes
  mfd: intel-lpss: Add Intel Comet Lake PCI IDs
  mfd: lochnagar: Add links to binding docs for sound and hwmon
  mfd: ab8500-debugfs: Fix a typo ("deubgfs")
  mfd: imx6sx: Add MQS register definition for iomuxc gpr
  dt-bindings: mfd: LMU: Fix lm3632 dt binding example
  mfd: intel_quark_i2c_gpio: Adjust IOT2000 matching
  mfd: da9063: Fix OTP control register names to match datasheets for DA9063/63L
  mfd: tps65912-spi: Add missing of table registration
  mfd: axp20x: Add USB power supply mfd cell to AXP803
  mfd: sun6i-prcm: Fix build warning for non-OF configurations
  mfd: intel-lpss: Set the device in reset state when init
  platform/chrome: Add support for v1 of host sleep event
  mfd: cros_ec: Add host_sleep_event_v1 command
  mfd: cros_ec: Instantiate the CrOS USB PD logger driver
  mfd: cs47l90: Make DAC_AEC_CONTROL_2 readable
  mfd: cs47l35: Make DAC_AEC_CONTROL_2 readable
  ...
parents 414147d9 ed835136

Documentation/devicetree/bindings/arm/altera/socfpga-system.txt

+12 −0
Original line number Diff line number Diff line
@@ -11,3 +11,15 @@ Example: 
		reg = <0xffd08000 0x1000>;

		cpu1-start-addr = <0xffd080c4>;

	};



ARM64 - Stratix10

Required properties:

- compatible : "altr,sys-mgr-s10"

- reg : Should contain 1 register range(address and length)

        for system manager register.



Example:

	 sysmgr@ffd12000 {

		compatible = "altr,sys-mgr-s10";

		reg = <0xffd12000 0x228>;

	};

Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt

+2 −0
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ Properties: 
                 - " st,stm32mp157-syscfg " - for stm32mp157 based SoCs,

                 second value must be always "syscon".

   - reg : offset and length of the register set.

   - clocks: phandle to the syscfg clock



 Example:

         syscfg: syscon@50020000 {

                 compatible = "st,stm32mp157-syscfg", "syscon";

                 reg = <0x50020000 0x400>;

                 clocks = <&rcc SYSCFG>;

         };

Documentation/devicetree/bindings/input/max77650-onkey.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Onkey driver for MAX77650 PMIC from Maxim Integrated.



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

see Documentation/devicetree/bindings/mfd/max77650.txt.



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

the device tree.



Required properties:

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

- compatible:		Must be "maxim,max77650-onkey".



Optional properties:

- linux,code:		The key-code to be reported when the key is pressed.

			Defaults to KEY_POWER.

- maxim,onkey-slide:	The system's button is a slide switch, not the default

			push button.



Example:

--------



	onkey {

		compatible = "maxim,max77650-onkey";

		linux,code = <KEY_END>;

		maxim,onkey-slide;

	};

Documentation/devicetree/bindings/leds/leds-max77650.txt

0 → 100644
+57 −0
Original line number Diff line number Diff line 
LED driver for MAX77650 PMIC from Maxim Integrated.



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

see Documentation/devicetree/bindings/mfd/max77650.txt.



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

the device tree.



This device has three current sinks.



Required properties:

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

- compatible:		Must be "maxim,max77650-led"

- #address-cells:	Must be <1>.

- #size-cells:		Must be <0>.



Each LED is represented as a sub-node of the LED-controller node. Up to

three sub-nodes can be defined.



Required properties of the sub-node:

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



- reg:			Must be <0>, <1> or <2>.



Optional properties of the sub-node:

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



- label:		See Documentation/devicetree/bindings/leds/common.txt

- linux,default-trigger: See Documentation/devicetree/bindings/leds/common.txt



For more details, please refer to the generic GPIO DT binding document

<devicetree/bindings/gpio/gpio.txt>.



Example:

--------



	leds {

		compatible = "maxim,max77650-led";

		#address-cells = <1>;

		#size-cells = <0>;



		led@0 {

			reg = <0>;

			label = "blue:usr0";

		};



		led@1 {

			reg = <1>;

			label = "red:usr1";

			linux,default-trigger = "heartbeat";

		};



		led@2 {

			reg = <2>;

			label = "green:usr2";

		};

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
   "atmel,sama5d2-hlcdc"

   "atmel,sama5d3-hlcdc"

   "atmel,sama5d4-hlcdc"

   "microchip,sam9x60-hlcdc"

 - reg: base address and size of the HLCDC device registers.

 - clock-names: the name of the 3 clocks requested by the HLCDC device.

   Should contain "periph_clk", "sys_clk" and "slow_clk".

CRA Git | Maintained and supported by SUSTech CRA and CCSE