Commit 512b7d37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD updates from Lee Jones:
 "Core Frameworks:
   - Constify 'properties' attribute in core header file

  New Drivers:
   - Add support for Gateworks System Controller
   - Add support for MediaTek MT6358 PMIC
   - Add support for Mediatek MT6360 PMIC
   - Add support for Monolithic Power Systems MP2629 ADC and Battery charger

  Fix-ups:
   - Use new I2C API in htc-i2cpld
   - Remove superfluous code in sprd-sc27xx-spi
   - Improve error handling in stm32-timers
   - Device Tree additions/fixes in mt6397
   - Defer probe betterment in wm8994-core
   - Improve module handling in wm8994-core
   - Staticify in stpmic1
   - Trivial (spelling, formatting) in tqmx86

  Bug Fixes:
   - Fix incorrect register/PCI IDs in intel-lpss-pci
   - Fix unbalanced Regulator API calls in wm8994-core
   - Fix double free() in wcd934x
   - Remove IRQ domain on failure in stmfx
   - Reset chip on resume in stmfx
   - Disable/enable IRQs on suspend/resume in stmfx
   - Do not use bulk writes on H/W which does not support them in max77620"

* tag 'mfd-next-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (29 commits)
  mfd: mt6360: Remove duplicate REGMAP_IRQ_REG_LINE() entry
  mfd: Add support for PMIC MT6360
  mfd: max77620: Use single-byte writes on MAX77620
  mfd: wcd934x: Drop kfree for memory allocated with devm_kzalloc
  mfd: stmfx: Disable IRQ in suspend to avoid spurious interrupt
  mfd: stmfx: Fix stmfx_irq_init error path
  mfd: stmfx: Reset chip on resume as supply was disabled
  mfd: wm8994: Silence warning about supplies during deferred probe
  mfd: wm8994: Fix unbalanced calls to regulator_bulk_disable()
  mfd: wm8994: Fix driver operation if loaded as modules
  dt-bindings: mfd: mediatek: Add MT6397 Pin Controller
  mfd: Constify properties in mfd_cell
  mfd: stm32-timers: Use dma_request_chan() instead dma_request_slave_channel()
  mfd: sprd: Remove unnecessary spi_bus_type setting
  mfd: intel-lpss: Update LPSS UART #2 PCI ID for Jasper Lake
  mfd: tqmx86: Fix a typo in MODULE_DESCRIPTION
  mfd: stpmic1: Make stpmic1_regmap_config static
  mfd: htc-i2cpld: Convert to use i2c_new_client_device()
  MAINTAINERS: Add entry for mp2629 Battery Charger driver
  power: supply: mp2629: Add impedance compensation config
  ...
parents acf25aa6 098c4adf

Documentation/ABI/testing/sysfs-class-power-mp2629

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/sys/class/power_supply/mp2629_battery/batt_impedance_compen

Date:		April 2020

KernelVersion:	5.7

Description:

		Represents a battery impedance compensation to accelerate charging.



                Access: Read, Write

                Valid values: Represented in milli-ohms. Valid range is [0, 140].

Documentation/devicetree/bindings/mfd/mps,mp2629.yaml

0 → 100644
+62 −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/mps,mp2629.yaml#

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



title: MP2629 Battery Charger PMIC from Monolithic Power System.



maintainers:

  - Saravanan Sekar <sravanhome@gmail.com>



description: |

  MP2629 is a PMIC providing battery charging and power supply for smartphones,

  wireless camera and portable devices. Chip is controlled over I2C.



  The battery charge management device handles battery charger controller and

  ADC IIO device for battery, system voltage



properties:

  compatible:

    const: mps,mp2629



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  interrupt-controller: true



  "#interrupt-cells":

    const: 2

    description:

      The first cell is the IRQ number, the second cell is the trigger type.



required:

  - compatible

  - reg

  - interrupts

  - interrupt-controller

  - "#interrupt-cells"



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/input/linux-event-codes.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@4b {

            compatible = "mps,mp2629";

            reg = <0x4b>;



            interrupt-controller;

            interrupt-parent = <&gpio2>;

            #interrupt-cells = <2>;

            interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

        };

    };

Documentation/devicetree/bindings/mfd/mt6397.txt

+15 −4
Original line number Diff line number Diff line
@@ -18,24 +18,30 @@ See the following for pwarp node definitions: 
This document describes the binding for MFD device and its sub module.



Required properties:

compatible: "mediatek,mt6397" or "mediatek,mt6323"

compatible:

	"mediatek,mt6323" for PMIC MT6323

	"mediatek,mt6358" for PMIC MT6358

	"mediatek,mt6397" for PMIC MT6397



Optional subnodes:



- rtc

	Required properties: Should be one of follows

		- compatible: "mediatek,mt6323-rtc"

		- compatible: "mediatek,mt6358-rtc"

		- compatible: "mediatek,mt6397-rtc"

	For details, see ../rtc/rtc-mt6397.txt

- regulators

	Required properties:

		- compatible: "mediatek,mt6397-regulator"

	see ../regulator/mt6397-regulator.txt

		- compatible: "mediatek,mt6323-regulator"

	see ../regulator/mt6323-regulator.txt

		- compatible: "mediatek,mt6358-regulator"

	see ../regulator/mt6358-regulator.txt

		- compatible: "mediatek,mt6397-regulator"

	see ../regulator/mt6397-regulator.txt

- codec

	Required properties:

		- compatible: "mediatek,mt6397-codec"

		- compatible: "mediatek,mt6397-codec" or "mediatek,mt6358-sound"

- clk

	Required properties:

		- compatible: "mediatek,mt6397-clk"
@@ -54,6 +60,11 @@ Optional subnodes: 
		- compatible: "mediatek,mt6323-pwrc"

	For details, see ../power/reset/mt6323-poweroff.txt



- pin-controller

	Required properties:

		- compatible: "mediatek,mt6397-pinctrl"

	For details, see ../pinctrl/pinctrl-mt65xx.txt



Example:

	pwrap: pwrap@1000f000 {

		compatible = "mediatek,mt8135-pwrap";

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -11474,10 +11474,15 @@ F: kernel/module.c 
MONOLITHIC POWER SYSTEM PMIC DRIVER

M:	Saravanan Sekar <sravanhome@gmail.com>

S:	Maintained

F:	Documentation/devicetree/bindings/mfd/mps,mp2629.yaml

F:	Documentation/devicetree/bindings/regulator/mps,mp*.yaml

F:	drivers/iio/adc/mp2629_adc.c

F:	drivers/mfd/mp2629.c

F:	drivers/power/supply/mp2629_charger.c

F:	drivers/regulator/mp5416.c

F:	drivers/regulator/mpq7920.c

F:	drivers/regulator/mpq7920.h

F:	include/linux/mfd/mp2629.h









MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER









S:	Orphan
































drivers/iio/adc/Kconfig



+10
−0






























Original line number
Diff line number
Diff line







@@ -692,6 +692,16 @@ config MESON_SARADC







	  To compile this driver as a module, choose M here: the









	  module will be called meson_saradc.



















config MP2629_ADC









	tristate "Monolithic MP2629 ADC driver"









	depends on MFD_MP2629









	help









	  Say yes to have support for battery charger IC MP2629 ADC device









	  accessed over I2C.



















	  This driver provides ADC conversion of system, input power supply









	  and battery voltage & current information.



















config NAU7802









	tristate "Nuvoton NAU7802 ADC driver"









	depends on I2C








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE