Commit 6c2fe5ca authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge tag 'tags/ib-mfd-iio-power-v5.8' into psy-next 



This merges the MP2629 battery charge management immutable branch
between MFD, IIO and power-supply due for the v5.8 merge window
into power-supply for-next branch.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parents c3d80522 904ac71f

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>;

        };

    };

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -11395,10 +11395,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
































drivers/iio/adc/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -65,6 +65,7 @@ obj-$(CONFIG_MCP3911) += mcp3911.o







obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o









obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o









obj-$(CONFIG_MESON_SARADC) += meson_saradc.o









obj-$(CONFIG_MP2629_ADC) += mp2629_adc.o









obj-$(CONFIG_MXS_LRADC_ADC) += mxs-lradc-adc.o









obj-$(CONFIG_NAU7802) += nau7802.o









obj-$(CONFIG_NPCM_ADC) += npcm_adc.o