Reported-by: NJulia Lawall <julia@diku.dk>
Signed-off-by: NIan Lartey <ian@opensource.wolfsonmicro.com>
Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

NXP ISP1704 is Battery Charging Specification 1.0 compliant USB
transceiver. This adds a power supply driver for ISP1704 and
ISP1707 USB transceivers.
Signed-off-by: NHeikki Krogerus <ext-heikki.krogerus@nokia.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

There are 3600 seconds per not 3600 hours per second. Correcting this
along with the previous fix gives sensible numbers.
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The arguments to intel_scu_ipc_command are "command, subcommand"
the battery driver got this the wrong way around.
Signed-off-by: NArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

drivers/power/olpc_battery.c:387: error: unknown field 'owner' specified in initializer
drivers/power/olpc_battery.c:387: warning: excess elements in struct initializer
drivers/power/olpc_battery.c:387: warning: (near initialization for 'olpc_bat_eeprom.attr')

The .owner field has been dropped from the attr struct.
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>

Add support for the battery voltage measurement part of the JZ4740 ADC unit.
Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
Acked-by: NAnton Vorontsov <cbouatmailru@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1416/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>

Signed-off-by: NMarek Vasut <marek.vasut@gmail.com>
Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NEric Miao <eric.y.miao@gmail.com>

s3c-adc-battery is driver for monitoring and charging battery on
iPAQ H1930/H1940/RX1950.

It depends on s3c-adc driver to get battery voltage and current.
Signed-off-by: NVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The ds2782_get_capacity function should return 0 on success, not the
capacity value.
Signed-off-by: NRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The PMIC Battery driver provides battery charging and battery gauge
functionality on Intel MID platforms. This provides the basic functions.
There are some USB drivers to merge before the selection of charging
between the different USB power levels can be enabled.

Moved to a platform device by Alek Du.
Signed-off-by: NNithish Mahalingam <nithish.mahalingam@intel.com>
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This patch changes the name of get_current function pointer to
get_battery_current to resolve a name conflict with the get_current
macro defined in current.h.

This conflict resulted in a build-failure[1] for the sh4 arch
allyesconfig:

  drivers/power/ds2782_battery.c:216:48: error: macro "get_current"
  passed 2 arguments, but takes just

This patch fixes the issue. To be consistent the other function pointers
(_voltage,_capacity) were renamed too.
Signed-off-by: NPeter Huewe <peterhuewe@gmx.de>
Acked-by: NRyan Mallon <ryan@bluewatersys.com>
Acked-by: NMike Rapoport <mike@compulab.co.il>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Remove redundant includes and add slab.h to fix problem with building.
Signed-off-by: NMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: NEric Miao <eric.y.miao@gmail.com>

I2C drivers can use the clientdata-pointer to point to private data. As I2C
devices are not really unregistered, but merely detached from their driver, it
used to be the drivers obligation to clear this pointer during remove() or a
failed probe(). As a couple of drivers forgot to do this, it was agreed that it
was cleaner if the i2c-core does this clearance when appropriate, as there is
no guarantee for the lifetime of the clientdata-pointer after remove() anyhow.
This feature was added to the core with commit
e4a7b9b0 to fix the faulty drivers.

As there is no need anymore to clear the clientdata-pointer, remove all current
occurrences in the drivers to simplify the code and prevent confusion.
Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: NRichard Purdie <rpurdie@linux.intel.com>
Acked-by: NDmitry Torokhov <dtor@mail.ru>
Signed-off-by: NJean Delvare <khali@linux-fr.org>

Commit 5f487cd3 (power_supply: Use
attribute groups) causes a regression the power supply core does not
export the 'type' attribute anymore.

POWER_SUPPLY_PROP_TYPE is handled by the power supply core without the
low-level driver, so power_supply_attr_is_visible() must always return
the entry as readable.
Reported-by: NRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: NDaniel Mack <daniel@caiaq.de>
Tested-by: NRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This allows bin_attr->read,write,mmap callbacks to check file specific data
(such as inode owner) as part of any privilege validation.
Signed-off-by: NChris Wright <chrisw@sous-sol.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

For userspace tools and daemons, it might be necessary to adjust
the charge_now and charge_full properties of the ds2760 battery monitor,
for example for unavoidable corrections due to aging batteries.
Signed-off-by: NDaniel Mack <daniel@caiaq.de>
Cc: Matt Reimer <mreimer@vpop.net>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Tejun Heo <tj@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
Cc: Len Brown <len.brown@intel.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This patch adds support for writeable power supply properties and
exposes them as writeable to sysfs.

A power supply implementation must implement two new function calls in
order to use that feature:

  int set_property(struct power_supply *psy,
                   enum power_supply_property psp,
                   const union power_supply_propval *val);

  int property_is_writeable(struct power_supply *psy,
                            enum power_supply_property psp);
Signed-off-by: NDaniel Mack <daniel@caiaq.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
Cc: Len Brown <len.brown@intel.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Matt Reimer <mreimer@vpop.net>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This fixes a race between power supply device and initial
attributes creation, plus makes it possible to implement
writable properties.

[Daniel Mack - removed superflous return statement
 and dropped .mode attribute from POWER_SUPPLY_ATTR]
Suggested-by: NGreg KH <gregkh@suse.de>
Suggested-by: NKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>
Tested-by: NDaniel Mack <daniel@caiaq.de>

Just a handy driver that is used for testing purposes.
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The driver isn't buildable since 2.6.32 (i.e. commit b4028437
"Driver core: move dev_get/set_drvdata to drivers/base/dd.c"):

  CC      tosa_battery.o
tosa_battery.c: In function 'tosa_read_bat':
tosa_battery.c:64: error: 'struct device' has no member named 'driver_data'
tosa_battery.c: In function 'tosa_read_temp':
tosa_battery.c:84: error: 'struct device' has no member named 'driver_data'

Nowadays we must not access driver_data directly, use dev_get_drvdata()
instead.
Signed-off-by: NDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This patch fixes following sparse warning:

drivers/power/wm97xx_battery.c:311:6: warning: symbol 'wm97xx_bat_set_pdata' was not declared. Should it be static?

Note that we can't just include linux/wm97xx_batt.h because the header
is deprecated, and so this pops up:

In file included from drivers/power/wm97xx_battery.c:22:
include/linux/wm97xx_batt.h:6: warning: #warning This file will be removed soon, use wm97xx.h instead!

Since wm97xx_bat_set_pdata() is also deprecated (in favour of pdata
passed via AC97 bus), just workaround the issue by declaring the
function in wm97xx_battery.c.
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Constructions like 'if (id->driver_data == 1)' look quite weird.
This patch introduces 'enum ds278x_num_id', which makes things
much more understandable, i.e. 'if (id->driver_data == DS2786)'.
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>
Acked-by: NMike Rapoport <mike@compulab.co.il>

Signed-off-by: NYulia Vilensky <vilensky@compulab.co.il>
Signed-off-by: NMike Rapoport <mike@compulab.co.il>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Add function prototypes for power management events so they can be
handled and used by platform implementations.
Signed-off-by: NDaniel Mack <daniel@caiaq.de>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Since the WM831x core has been converted to use genirq for the
interrupt controller there is no longer any need for chip specific
wrappers for IRQ operations. Convert to use genirq directly.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This patch adds driver for Zipit Z2 battery chip called AER915. No
details are known about the chip. The chip is available through I2C bus
at address 0x55 and it's register 0x02 contains battery voltage.
Signed-off-by: NMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Probably due to a copy & paste bug, clientdata was set again to the data
structure (which is freed immediately afterwards) when it should be
NULLed. Just remove the calls as the i2c-core does this automatically
now.
Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files.  percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.

percpu.h -> slab.h dependency is about to be removed.  Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability.  As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.

  http://userweb.kernel.org/~tj/misc/slabh-sweep.py

The script does the followings.

* Scan files for gfp and slab usages and update includes such that
  only the necessary includes are there.  ie. if only gfp is used,
  gfp.h, if slab is used, slab.h.

* When the script inserts a new include, it looks at the include
  blocks and try to put the new include such that its order conforms
  to its surrounding.  It's put in the include block which contains
  core kernel includes, in the same order that the rest are ordered -
  alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
  doesn't seem to be any matching order.

* If the script can't find a place to put a new include (mostly
  because the file doesn't have fitting include block), it prints out
  an error message indicating which .h file needs to be added to the
  file.

The conversion was done in the following steps.

1. The initial automatic conversion of all .c files updated slightly
   over 4000 files, deleting around 700 includes and adding ~480 gfp.h
   and ~3000 slab.h inclusions.  The script emitted errors for ~400
   files.

2. Each error was manually checked.  Some didn't need the inclusion,
   some needed manual addition while adding it to implementation .h or
   embedding .c file was more appropriate for others.  This step added
   inclusions to around 150 files.

3. The script was run again and the output was compared to the edits
   from #2 to make sure no file was left behind.

4. Several build tests were done and a couple of problems were fixed.
   e.g. lib/decompress_*.c used malloc/free() wrappers around slab
   APIs requiring slab.h to be added manually.

5. The script was run on all .h files but without automatically
   editing them as sprinkling gfp.h and slab.h inclusions around .h
   files could easily lead to inclusion dependency hell.  Most gfp.h
   inclusion directives were ignored as stuff from gfp.h was usually
   wildly available and often used in preprocessor macros.  Each
   slab.h inclusion directive was examined and added manually as
   necessary.

6. percpu.h was updated not to include slab.h.

7. Build test were done on the following configurations and failures
   were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
   distributed build env didn't work with gcov compiles) and a few
   more options had to be turned off depending on archs to make things
   build (like ipr on powerpc/64 which failed due to missing writeq).

   * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
   * powerpc and powerpc64 SMP allmodconfig
   * sparc and sparc64 SMP allmodconfig
   * ia64 SMP allmodconfig
   * s390 SMP allmodconfig
   * alpha SMP allmodconfig
   * um on x86_64 SMP allmodconfig

8. percpu.h modifications were reverted so that it could be applied as
   a separate patch and serve as bisection point.

Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: NTejun Heo <tj@kernel.org>
Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

MAX8925 is a PMIC that contains charger component
Signed-off-by: NHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The headphone detect and charger are using the IRQ numbers so need
to take account of irq_base with the genirq conversion. I obviously
picked the wrong system for initial testing.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

To better match genirq.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>

The chip returns voltage and current in mV and mA, but
power supply class uses uV and uA, so add missing conversion.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The BQ27x00 series of chips can report time-to-empty and
time-to-full, so let's add corresponding properties.
Also report charge status based on status flag register.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

BQ27500 is newer fuel gauge chip from TI with slightly changed
register layout and some different register semantics. Add new i2c
ID for it and handle differences where needed. Also rename bq27200
functions to bq27x00, as they are no longer bq27200 specific.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Acked-by: NRodolfo Giometti <giometti@linux.it>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The power supply class requires tenths of degree Celsius.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Acked-by: NRodolfo Giometti <giometti@linux.it>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

These are probably leftover from old TI code.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Acked-by: NRodolfo Giometti <giometti@linux.it>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The bq27x00 registers are little endian, so just read them as such
and don't do double endian swap on LE machines.

This also gets rid of strange looking shift that was done after
reading 8bit register because endian swap in bq27x00_read() was
messing it up.
Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
Acked-by: NRodolfo Giometti <giometti@linux.it>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

platfrom -> platform
monotor -> monitor
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Cc: Anton Vorontsov <cbouatmailru@gmail.com>
Acked-by: NMike Rapoport <mike@compulab.co.il>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>

Staticise work_lock (nothing outside the driver has any reason to
see it) and specify dev when requesting the charger IRQ (since that's
what we pass in when we free it).
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>