Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7a0208 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'ib-mfd-gpio-input-leds-power-v5.2' of...

Merge tag 'ib-mfd-gpio-input-leds-power-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next

Sync up with MFD tree to bring in MAX77650 PMIC driver.
parents 2a267e7c 796fad01
Loading
Loading
Loading
Loading
+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;
	};
+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";
		};
	};
+46 −0
Original line number Diff line number Diff line
MAX77650 ultra low-power PMIC from Maxim Integrated.

Required properties:
-------------------
- compatible:		Must be "maxim,max77650"
- reg:			I2C device address.
- interrupts:		The interrupt on the parent the controller is
			connected to.
- interrupt-controller: Marks the device node as an interrupt controller.
- #interrupt-cells:	Must be <2>.

- gpio-controller:	Marks the device node as a gpio controller.
- #gpio-cells:		Must be <2>. The first cell is the pin number and
			the second cell is used to specify the gpio active
			state.

Optional properties:
--------------------
gpio-line-names:	Single string containing the name of the GPIO line.

The GPIO-controller module is represented as part of the top-level PMIC
node. The device exposes a single GPIO line.

For device-tree bindings of other sub-modules (regulator, power supply,
LEDs and onkey) refer to the binding documents under the respective
sub-system directories.

For more details on GPIO bindings, please refer to the generic GPIO DT
binding document <devicetree/bindings/gpio/gpio.txt>.

Example:
--------

	pmic@48 {
		compatible = "maxim,max77650";
		reg = <0x48>;

		interrupt-controller;
		interrupt-parent = <&gpio2>;
		#interrupt-cells = <2>;
		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		gpio-controller;
		#gpio-cells = <2>;
		gpio-line-names = "max77650-charger";
	};
+28 −0
Original line number Diff line number Diff line
Battery charger 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 charger is represented as a sub-node of the PMIC node on the device tree.

Required properties:
--------------------
- compatible:		Must be "maxim,max77650-charger"

Optional properties:
--------------------
- input-voltage-min-microvolt:	Minimum CHGIN regulation voltage. Must be one
				of: 4000000, 4100000, 4200000, 4300000,
				4400000, 4500000, 4600000, 4700000.
- input-current-limit-microamp:	CHGIN input current limit (in microamps). Must
				be one of: 95000, 190000, 285000, 380000,
				475000.

Example:
--------

	charger {
		compatible = "maxim,max77650-charger";
		input-voltage-min-microvolt = <4200000>;
		input-current-limit-microamp = <285000>;
	};
+14 −0
Original line number Diff line number Diff line
@@ -9408,6 +9408,20 @@ S: Maintained
F:	Documentation/devicetree/bindings/sound/max9860.txt
F:	sound/soc/codecs/max9860.*

MAXIM MAX77650 PMIC MFD DRIVER
M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>
L:	linux-kernel@vger.kernel.org
S:	Maintained
F:	Documentation/devicetree/bindings/*/*max77650.txt
F:	Documentation/devicetree/bindings/*/max77650*.txt
F:	include/linux/mfd/max77650.h
F:	drivers/mfd/max77650.c
F:	drivers/regulator/max77650-regulator.c
F:	drivers/power/supply/max77650-charger.c
F:	drivers/input/misc/max77650-onkey.c
F:	drivers/leds/leds-max77650.c
F:	drivers/gpio/gpio-max77650.c

MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
M:	Javier Martinez Canillas <javier@dowhile0.org>
L:	linux-kernel@vger.kernel.org
Loading