Merge branches 'ib-mfd-arm-3.18', 'ib-mfd-hwmon-leds-watchdog-3.18' and...

		This file is writeable and can be used to set the assumed

		battery 'full level'. As batteries age, this value has to be

		amended over time.

What:		/sys/class/power_supply/max14577-charger/device/fast_charge_timer

Date:		July 2014

KernelVersion:	3.18.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Description:

		This entry shows and sets the maximum time the max14577

		charger operates in fast-charge mode. When the timer expires

		the device will terminate fast-charge mode (charging current

		will drop to 0 A) and will trigger interrupt.

		Valid values:

		- 5, 6 or 7 (hours),

		- 0: disabled.

Maxim MAX14577/77836 Multi-Function Device

MAX14577 is a Multi-Function Device with Micro-USB Interface Circuit, Li+

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.

Required properties:

- compatible : Must be "maxim,max14577" or "maxim,max77836".

- reg : I2C slave address for the max14577 chip (0x25 for max14577/max77836)

- interrupts : IRQ line for the chip.

- interrupt-parent :  The parent interrupt controller.

Required nodes:

 - charger :

	Node for configuring the charger driver.

	Required properties:

		- compatible : "maxim,max14577-charger"

			or "maxim,max77836-charger"

		- maxim,fast-charge-uamp : Current in uA for Fast Charge;

			Valid values:

			- for max14577: 90000 - 950000;

			- for max77836: 45000 - 475000;

		- maxim,eoc-uamp : Current in uA for End-Of-Charge mode;

			Valid values:

			- for max14577: 50000 - 200000;

			- for max77836: 5000 - 100000;

		- maxim,ovp-uvolt : OverVoltage Protection Threshold in uV;

			In an overvoltage condition, INT asserts and charging

			stops. Valid values:

			- 6000000, 6500000, 7000000, 7500000;

		- maxim,constant-uvolt : Battery Constant Voltage in uV;

			Valid values:

			- 4000000 - 4280000 (step by 20000);

			- 4350000;

Optional nodes:

- max14577-muic/max77836-muic :

	Node used only by extcon consumers.

	Required properties:

		- compatible : "maxim,max14577-muic" or "maxim,max77836-muic"

- regulators :

	Required properties:

		- compatible : "maxim,max14577-regulator"

			or "maxim,max77836-regulator"

	May contain a sub-node per regulator from the list below. Each

	sub-node should contain the constraints and initialization information

	for that regulator. See regulator.txt for a description of standard

	properties for these sub-nodes.

	List of valid regulator names:

	- for max14577: CHARGER, SAFEOUT.

	- for max77836: CHARGER, SAFEOUT, LDO1, LDO2.

	The SAFEOUT is a fixed voltage regulator so there is no need to specify

	voltages for it.

Example:

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

max14577@25 {

	compatible = "maxim,max14577";

	reg = <0x25>;

	interrupt-parent = <&gpx1>;

	interrupts = <5 IRQ_TYPE_NONE>;

	muic: max14577-muic {

		compatible = "maxim,max14577-muic";

	};

	regulators {

		compatible = "maxim,max14577-regulator";

		SAFEOUT {

			regulator-name = "SAFEOUT";

		};

		CHARGER {

			regulator-name = "CHARGER";

			regulator-min-microamp = <90000>;

			regulator-max-microamp = <950000>;

			regulator-boot-on;

		};

	};

	charger {

		compatible = "maxim,max14577-charger";

		maxim,constant-uvolt = <4350000>;

		maxim,fast-charge-uamp = <450000>;

		maxim,eoc-uamp = <50000>;

		maxim,ovp-uvolt = <6500000>;

	};

};

max77836@25 {

	compatible = "maxim,max77836";

	reg = <0x25>;

	interrupt-parent = <&gpx1>;

	interrupts = <5 IRQ_TYPE_NONE>;

	muic: max77836-muic {

		compatible = "maxim,max77836-muic";

	};

	regulators {

		compatible = "maxim,max77836-regulator";

		SAFEOUT {

			regulator-name = "SAFEOUT";

		};

		CHARGER {

			regulator-name = "CHARGER";

			regulator-min-microamp = <90000>;

			regulator-max-microamp = <950000>;

			regulator-boot-on;

		};

		LDO1 {

			regulator-name = "LDO1";

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};

		LDO2 {

			regulator-name = "LDO2";

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <3950000>;

		};

	};

	charger {

		compatible = "maxim,max77836-charger";

		maxim,constant-uvolt = <4350000>;

		maxim,fast-charge-uamp = <225000>;

		maxim,eoc-uamp = <7500>;

		maxim,ovp-uvolt = <6500000>;

	};

};

Kernel driver menf21bmc_hwmon

=============================

Supported chips:

	* MEN 14F021P00

	  Prefix: 'menf21bmc_hwmon'

	  Adresses scanned: -

Author: Andreas Werner <andreas.werner@men.de>

Description

-----------

The menf21bmc is a Board Management Controller (BMC) which provides an I2C

interface to the host to access the features implemented in the BMC.

This driver gives access to the voltage monitoring feature of the main

voltages of the board.

The voltage sensors are connected to the ADC inputs of the BMC which is

a PIC16F917 Mikrocontroller.

Usage Notes

-----------

This driver is part of the MFD driver named "menf21bmc" and does

not auto-detect devices.

You will have to instantiate the MFD driver explicitly.

Please see Documentation/i2c/instantiating-devices for

details.

Sysfs entries

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

The following attributes are supported. All attributes are read only

The Limits are read once by the driver.

in0_input	+3.3V input voltage

in1_input	+5.0V input voltage

in2_input	+12.0V input voltage

in3_input	+5V Standby input voltage

in4_input	VBAT (on board battery)

in[0-4]_min	Minimum voltage limit

in[0-4]_max	Maximum voltage limit

in0_label	"MON_3_3V"

in1_label	"MON_5V"

in2_label	"MON_12V"

in3_label	"5V_STANDBY"

in4_label	"VBAT"

	  This driver can also be built as a module.  If so, the module

	  will be called mcp3021.

config SENSORS_MENF21BMC_HWMON

	tristate "MEN 14F021P00 BMC Hardware Monitoring"

	depends on MFD_MENF21BMC

	help

	  Say Y here to include support for the MEN 14F021P00 BMC

	  hardware monitoring.

	  This driver can also be built as a module. If so the module

	  will be called menf21bmc_hwmon.

config SENSORS_ADCXX

	tristate "National Semiconductor ADCxxxSxxx"

	depends on SPI_MASTER

obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o

obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o

obj-$(CONFIG_SENSORS_MCP3021)	+= mcp3021.o

obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o

obj-$(CONFIG_SENSORS_NCT6683)	+= nct6683.o

obj-$(CONFIG_SENSORS_NCT6775)	+= nct6775.o

obj-$(CONFIG_SENSORS_NTC_THERMISTOR)	+= ntc_thermistor.o