Fix this link error on s390:

ERROR: "devm_request_threaded_irq" [drivers/power/goldfish_battery.ko] undefined!

Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

randconfig complains about:
drivers/power/da9030_battery.c:113: error: field ‘nb’ has incomplete type

because there is no direct include for notifier.h which defines
struct notifier_block.
Signed-off-by: NMichal Hocko <mhocko@suse.cz>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Reported temperature can be also negative, so cache value in non negative
Kelvin degree.
Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

__devinit, __devexit and __devexit_p have recently been removed and
should no longer be used.
Signed-off-by: NThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: NJason Cooper <jason@lakedaemon.net>
Acked-by: NAndrew Lunn <andrew@lunn.ch>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

"pdata" and "pchg->pdata" are the same.  Changing the function call to
pdata->get_batt_present() makes it match the check and it's a little
cleaner.
Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
Acked-by: NMilo Kim <milo.kim@ti.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.

Conflicts:
	drivers/power/Kconfig

Power supply subsystem creates thermal zone device for the property
'POWER_SUPPLY_PROP_TEMP' which requires thermal subsystem to be ready
before 'ab8500 battery temperature monitor' driver is initialized. ab8500
btemp driver is initialized with subsys_initcall whereas thermal subsystem
is initialized with fs_initcall which causes
thermal_zone_device_register(...) to crash since the required structure
'thermal_class' is not initialized yet:

Unable to handle kernel NULL pointer dereference at virtual address 000000a4
pgd = c0004000
[000000a4] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0    Tainted: G        W     (3.8.0-rc4-00001-g632fda8-dirty #1)
PC is at _raw_spin_lock+0x18/0x54
LR is at get_device_parent+0x50/0x1b8
pc : [<c02f1dd0>]    lr : [<c01cb248>]    psr: 60000013
sp : ef04bdc8  ip : 00000000  fp : c0446180
r10: ef216e38  r9 : c03af5d0  r8 : ef275c18
r7 : 00000000  r6 : c0476c14  r5 : ef275c18  r4 : ef095840
r3 : ef04a000  r2 : 00000001  r1 : 00000000  r0 : 000000a4
Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
Control: 10c5787d  Table: 0000404a  DAC: 00000015
Process swapper/0 (pid: 1, stack limit = 0xef04a238)
Stack: (0xef04bdc8 to 0xef04c000)
[...]
[<c02f1dd0>] (_raw_spin_lock+0x18/0x54) from [<c01cb248>] (get_device_parent+0x50/0x1b8)
[<c01cb248>] (get_device_parent+0x50/0x1b8) from [<c01cb8d8>] (device_add+0xa4/0x574)
[<c01cb8d8>] (device_add+0xa4/0x574) from [<c020b91c>] (thermal_zone_device_register+0x118/0x938)
[<c020b91c>] (thermal_zone_device_register+0x118/0x938) from [<c0202030>] (power_supply_register+0x170/0x1f8)
[<c0202030>] (power_supply_register+0x170/0x1f8) from [<c02055ec>] (ab8500_btemp_probe+0x208/0x47c)
[<c02055ec>] (ab8500_btemp_probe+0x208/0x47c) from [<c01cf0dc>] (platform_drv_probe+0x14/0x18)
[<c01cf0dc>] (platform_drv_probe+0x14/0x18) from [<c01cde70>] (driver_probe_device+0x74/0x20c)
[<c01cde70>] (driver_probe_device+0x74/0x20c) from [<c01ce094>] (__driver_attach+0x8c/0x90)
[<c01ce094>] (__driver_attach+0x8c/0x90) from [<c01cc640>] (bus_for_each_dev+0x4c/0x80)
[<c01cc640>] (bus_for_each_dev+0x4c/0x80) from [<c01cd6b4>] (bus_add_driver+0x16c/0x23c)
[<c01cd6b4>] (bus_add_driver+0x16c/0x23c) from [<c01ce54c>] (driver_register+0x78/0x14c)
[<c01ce54c>] (driver_register+0x78/0x14c) from [<c00086ac>] (do_one_initcall+0xfc/0x164)
[<c00086ac>] (do_one_initcall+0xfc/0x164) from [<c02e89c8>] (kernel_init+0x120/0x2b8)
[<c02e89c8>] (kernel_init+0x120/0x2b8) from [<c000e358>] (ret_from_fork+0x14/0x3c)
Code: e3c3303f e5932004 e2822001 e5832004 (e1903f9f)
---[ end trace ed9df72941b5bada ]---
Signed-off-by: NRajanikanth H.V <rajanikanth.hv@stericsson.com>
Cc: stable@vger.kernel.org
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

This patch affects on Android battery indicator. Battery driver should
send uevent message when battery status changes in order to get Android
battery level dynamically updated. Delayed work was added to periodically
check battery status and capacity.
Signed-off-by: NEvgeny Romanov <romanov@neurosoft.ru>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Add the emulated power driver for the Goldfish platform.

This folds together the code from the Google tree, Jun Nakajima's cleanups
and x86 porting work, and then a tidy up to pass checkpatch.
Signed-off-by: NMike A. Chan <mikechan@google.com>
[cleanup and x86 support]
Signed-off-by: NSheng Yang <sheng@linux.intel.com>
Signed-off-by: NYunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: NXiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: NJun Nakajima <jun.nakajima@intel.com>
Signed-off-by: NBruce Beare <bruce.j.beare@intel.com>
[ported to 3.4]
Signed-off-by: NTom Keel <thomas.keel@intel.com>
[ported to 3.7 and final tidy]
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

If charging is started before USB enumeration of an Accessory
Charger Adapter has finished, the AB8500 will generate a
VBUS_ERROR. This in turn results in timeouts and delays the
enumeration with around 15 seconds. This patch delays the
charging and then ramps currents slowly to avoid VBUS errors.
The delay allows the enumeration to have finished before
charging is turned on.
Signed-off-by: NMartin Sjoblom <martin.w.sjoblom@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

None of the aforementioned components have their own dedicated
platform data structures anymore. Instead they have all been
merged into one big Battery Management container. Let's remove
them and place all the nice newly added attributes into the core
container.
Signed-off-by: NLee Jones <lee.jones@linaro.org>

Do not touch the VBUSOVV in USBCHTRL2 when running on AB8505.
Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Tested-by: NMian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>

If battery is not identified while fg probe, mah_max_design gets
initialized with unknown battery's charge full design. Reinitialize
mah_max_design if battery is identified after fg probe.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NVijaya Kumar K-1 <vijay.kilari@stericsson.com>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NOlivier CLERGEAUD <olivier.clergeaud@stericsson.com>
Reviewed-by: NArun MURTHY <arun.murthy@stericsson.com>
Reviewed-by: NRabin VINCENT <rabin.vincent@stericsson.com>
Tested-by: NRupesh KUMAR <rupesh.kumar@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

The AC charger plug-in detection while booting causes I2C read
failure if AC charger is not connected. Now the LPN pin is enabled
for every PM2301 register access, which solves the issue.
Signed-off-by: NRupesh Kumar <rupesh.kumar@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NVijaya Kumar K-1 <vijay.kilari@stericsson.com>
Reviewed-by: NRabin VINCENT <rabin.vincent@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Enable support for low battery checking.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Flush all workqueues at suspend time to avoid suspending during work.
Signed-off-by: NJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>

When the charger is removed we need to go to INIT_RECOVERY
state instead of directly to RECOVERY state.
Signed-off-by: NMartin Bergstrom <martin.bergstrom@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Accessing autopower register fails on the AB8505 and ab9540 as
the fallback software control register has moved.
Signed-off-by: NMarcus Cooper <marcus.xm.cooper@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMattias WALLIN <mattias.wallin@stericsson.com>
Reviewed-by: NNicolas GUION <nicolas.guion@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Allow a user to check on AB8500 charging status from debugfs.
Signed-off-by: NLee Jones <lee.jones@linaro.org>

AB and PMxxx doesn't have same watchdog refresh period. Add watchdog
to refresh period parameters in x500 charger structure, this should
kick watchdog every 30sec. The AC charging should also kick both
pm2xxx and the AB charger watchdog.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLoic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Only root should have write permission on sysfs file ab8500_chargalg/chargalg.

Cc: stable@vger.kernel.org
Signed-off-by: NLee Jones <lee.jones@linaro.org>

There is no support to measure the main charger voltage and
current using AB9540 gpadc. Therefore this has been removed
from the driver.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-by: NRabin VINCENT <rabin.vincent@stericsson.com>
Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com>

Fix the way interrupts are handled within the PM2301 charging driver.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NOlivier CLERGEAUD <olivier.clergeaud@stericsson.com>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com>

Also shift the file description to a more suitable location.
Signed-off-by: NLee Jones <lee.jones@linaro.org>

When the charging safety timer elapses, the battery health is
shown as "Good". This is misleading and also makes it difficult
to distinguish issues relating to discharging despite the fact
that the charger is still connected.

When in actual fact a safety timer elapse is an indication of a
fault in the battery. Here we make this clearer by reporting
POWER_SUPPLY_HEALTH_UNSPEC_FAILURE instead.
Signed-off-by: NLee Jones <lee.jones@linaro.org>

Kicks the watchdog so charging will not stop.
Signed-off-by: NLee Jones <lee.jones@linaro.org>

Add AB9540 and AB8505 support to ABx500 BTEMP driver.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: NJonas ABERG <jonas.aberg@stericsson.com>

Changed conditions for restarting low battery measurements counter
and adjusted the interval between measurements to avoid RF burst
induced voltage drops, and to shorten time to decide to shut down.
Signed-off-by: NHakan Berg <hakan.berg@stericsson.com>
Signed-off-by: NMartin Bergstrom <martin.bergstrom@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>

AB8500 refuses to start charging when some types of non standard
chargers are connected. This change force the AB to start charging.
Signed-off-by: NHenrik Sölver <henrik.solver@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NYvan FILLION <yvan.fillion@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NYvan FILLION <yvan.fillion@stericsson.com>

AC charger driver for the DB9540 based platforms.
Signed-off-by: NRajkumar Kasirajan <rajkumar.kasirajan@stericsson.com>
Signed-off-by: NLoic Pallardy <loic.pallardy@stericsson.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Reviewed-by: NMichel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: NMichel JAOUEN <michel.jaouen@stericsson.com>

GPLv2+ is not a valid license string. Replace it with one that is.
Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

As HZ is a full-second, there is little point in rounding it.
Let's save a few cycles by using HZ directly.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

When calculating the average current the nominator will
overflow when the charging current is high.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NHenrik Sölver <henrik.solver@stericsson.com>
Reviewed-by: NPar-Olof HAKANSSON <par-olof.hakansson@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NPar-Olof HAKANSSON <par-olof.hakansson@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

A Legacy USB charger should be handled directly by the charger
driver.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NMarcus Cooper <marcus.xm.cooper@stericsson.com>
Reviewed-by: NKarl KOMIEROWSKI <karl.komierowski@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Cleanup of the ab8500_charger driver.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NMarcus Cooper <marcus.xm.cooper@stericsson.com>
Reviewed-by: NKarl KOMIEROWSKI <karl.komierowski@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Add support for the battery over-voltage situation
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NHakan Berg <hakan.berg@stericsson.com>
Reviewed-by: NKarl KOMIEROWSKI <karl.komierowski@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

BTEMP thermal compensation factor times 10 is applied in two places, probe
and get_property. Removed from probe.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NHakan Berg <hakan.berg@stericsson.com>
Reviewed-by: NKarl KOMIEROWSKI <karl.komierowski@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Round the capacity values for better enduser experience.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: Npender01 <peter.enderborg@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

The Travel and Carkit adapter should be handled directly by
the charger driver.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NMarcus Cooper <marcus.xm.cooper@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>

Ignore the low btemp interrupts for ab8500 3.0 and 3.3
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NHakan Berg <hakan.berg@stericsson.com>
Reviewed-by: NJonas ABERG <jonas.aberg@stericsson.com>
Tested-by: NMarcus COOPER <marcus.xm.cooper@stericsson.com>
Signed-off-by: NAnton Vorontsov <anton@enomsg.org>