1. Useless braces were omitted
2. Useless void casts were omitted
3. module exit name changed
   lp8727_chg_exit -> lp8727_exit
4. Pointer coding style changes
   no space between pointer('*') and pointer name
   ex) u8 * data -> u8 *data
5. Author information change : email and additional author
Signed-off-by: NMilo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

lp8727 i2c r/w functions are based on SMBUS I2C BLOCK. So the driver needs to
check whether i2c bus supports this functionality or not.
Signed-off-by: NWoogyom Kim <milo.kim@ti.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

National Semiconductor LP8727 is the battery charger with Micro/Mini
USB interface. This IC includes below functions:

- I2C interface for accessing user registers
- Single input Li-Ion battery charger
- Charger input ID detection from Micro/Mini USB
- Multiplexing switches on USB, UART
Signed-off-by: NWoogyom Kim <milo.kim@ti.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Charger Manager provides power-supply-class aggregating
information from multiple chargers and a fuel-gauge.
Signed-off-by: NDonggeun Kim <dg77.kim@samsung.com>
Signed-off-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Because battery health monitoring should be done even when suspended,
it needs to wake up and suspend periodically. Thus, userspace battery
monitoring may incur too much overhead; every device and task is woken
up periodically. Charger Manager uses suspend-again to provide
in-suspend monitoring.

This patch allows to monitor battery health in-suspend state.
Signed-off-by: NDonggeun Kim <dg77.kim@samsung.com>
Signed-off-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The interrupt for ac on/off can be missed during boot time.
Check if online by seeing if we have power.  We choose 0.5V
since this is high enough to avoid random reading from a
input that could be floating if no charger.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NTed Bennett <tbennett@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Reading the voltage, charge etc requires that we tell the chip
what property we want to read before reading it according to
maxim.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NThomas Liu <Thomas.Liu@maxim-ic.com>
Tested-by: NTed Bennett <tbennett@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

In max17042_get_property(...), the values returned by
max17042_read_reg are directly assigned to the variables,
even if the read results in an error.

This patch checks for the return code from max17042_read_reg and
exits the function if there is any error.
Signed-off-by: NRamakrishna Pallala <ramakrishna.pallala@intel.com>
Acked-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Add rated capacity of the HP iPAQ hx4700 3.7V 3600mAh (359114-001)
battery. For this battery the value of the rated capacity EEPROM
register at 0x32 is 14; thus rated_capacities[14] = 3600.
Signed-off-by: NPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Since commit [e58aa3d2: genirq: Run irq handlers with interrupts
disabled], We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler returns with
interrupts enabled (see commit [b738a50a: genirq: Warn when handler
enables interrupts]).

So now this flag is a NOOP and can be removed.
Signed-off-by: NYong Zhang <yong.zhang0@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

* power_supply_unregister call bq27x00_battery_get_property which
  call bq27x00_battery_poll
* make sure that bq27x00_battery_poll will not call
  schedule_delayed_work again after unregister (which cause OOPS)
Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

* Do not be noise if battery is not calibrated (use dev_dbg)
Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

* CI (Capacity Inaccurate) flag is set after full reset on bq27000 battery
* when is set, all capacity properties should be reported incorrectly,
  because there was no learning cycle and battery was not calibrated
* instead reporting incorrect values, report -ENODATA
Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

* This prevent reporting old current_now value for bq27000
* Also ask for current flags, to make sure that current_now
  will be reported with correct signature
Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The power core infrastructure allow external power change
events to be passed to drivers what are listed in the
supplied_to call back field.  Enable this feature by
allowing the supplied_to field to be passed to the driver.

This feature will enable drivers named in the supplied_to
field that have a external_power_changed callback to be
notified when power was been turned on or off.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The max8925 cannot return usb status.  The bits

       [MAX8925_IRQ_VCHG_USB_OVP] = {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 3,
       },
       [MAX8925_IRQ_VCHG_USB_F] =  {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 4,
       },
       [MAX8925_IRQ_VCHG_USB_R] = {
               .reg            = MAX8925_CHG_IRQ1,
               .mask_reg       = MAX8925_CHG_IRQ1_MASK,
               .offs           = 1 << 5,
       },

do not exist in the irq register.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

On brownstone rev 4 ac-insert detect is handled by vbus.

allow the platform code to configure the disabling of insert
by setting no_insert_detect.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Brownstone does not have temperature reading circuit hooked up.
This leads to spurious interrupts.

Allow the platform layer to indicate no temperature circuit
and do not activate interrupts if no temperature control is set
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The datasheet indicates a 12 bit value is returned for i2c
registers for voltage and current.  Code was assuming 8 bits.
But default for chip is 12 bit return value.

Voltage is returned in 2mV units  -- adjust to return as uV
per linux power spec

Adjust current calculation to return units in uA.
Signed-off-by: NPhilip Rakity <prakity@marvell.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

The 'val' is a 'unsigned char', so it is never less than zero.
Signed-off-by: NJonghwan Choi <jhbird.choi@gmail.com>
Acked-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as people use pretty recent kernels.

When DCDC input line over current detecting, PMIC will change charging
current automatically. Logging event is enough.
Signed-off-by: NMajor Lee <major_lee@wistron.com>
Signed-off-by: NAlan Cox <alan@linux.intel.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This change simplifies the implementation.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Acked-by: NDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

As suggested by Igor Grinberg, this change make the implementation looks
simpler.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

It is no longer used, so we can safely remove it.
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

This patch fixes the following noise (by renaming _drv to _driver):

WARNING: drivers/power/olpc_battery.o(.data+0x100): Section mismatch in reference from the variable olpc_battery_drv to the function .devinit.text:olpc_battery_probe()
The variable olpc_battery_drv references
the function __devinit olpc_battery_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

WARNING: drivers/power/olpc_battery.o(.data+0x104): Section mismatch in reference from the variable olpc_battery_drv to the function .devexit.text:olpc_battery_remove()
The variable olpc_battery_drv references
the function __devexit olpc_battery_remove()
If the reference is valid then annotate the
variable with __exit* (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

WARNING: drivers/power/olpc_battery.o(.data+0x128): Section mismatch in reference from the variable olpc_battery_drv to the variable .devinit.rodata:olpc_battery_ids
The variable olpc_battery_drv references
the variable __devinitconst olpc_battery_ids
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

Adding support to generate platform data when kernel is configured
through device tree.

Also adding the binding for the TI bq20z75 fuel gadge and the
bq20z75 driver.
Signed-off-by: NRhyland Klein <rklein@nvidia.com>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>

* git://git.infradead.org/iommu-2.6:
  intel-iommu: fix superpage support in pfn_to_dma_pte()
  intel-iommu: set iommu_superpage on VM domains to lowest common denominator
  intel-iommu: fix return value of iommu_unmap() API
  MAINTAINERS: Update VT-d entry for drivers/pci -> drivers/iommu move
  intel-iommu: Export a flag indicating that the IOMMU is used for iGFX.
  intel-iommu: Workaround IOTLB hang on Ironlake GPU
  intel-iommu: Fix AB-BA lockdep report

* 'for-linus' of http://people.redhat.com/agk/git/linux-dm:
  dm kcopyd: fix job_pool leak

Commit 4b239f45 ("x86-64, mm: Put early page table high") causes a S4
regression since 2.6.39, namely the machine reboots occasionally at S4
resume.  It doesn't happen always, overall rate is about 1/20.  But,
like other bugs, once when this happens, it continues to happen.

This patch fixes the problem by essentially reverting the memory
assignment in the older way.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Yinghai Lu <yinghai.lu@oracle.com>
[ We'll hopefully find the real fix, but that's too late for 3.1 now ]
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Fix memory leak introduced by commit a6e50b40
(dm snapshot: skip reading origin when overwriting complete chunk).

When allocating a set of jobs from kc->job_pool, job->master_job must be
set (to point to itself) so that the mempool item gets freed when the
master_job completes.

master_job was introduced by commit c6ea41fb
(dm kcopyd: preallocate sub jobs to avoid deadlock)
Reported-by: NMichael Leun <ml@newton.leun.net>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: NAlasdair G Kergon <agk@redhat.com>

* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung:
  ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
  ARM: S5P: fix offset calculation on gpio-interrupt

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83627ehf) Fix negative 8-bit temperature values

v2:
- register_syscore_ops(&s3c24xx_irq_syscore_ops) does not need to be
  conditionally compiled out, it is already optimized out on !CONFIG_PM
- fix also s3c2412 and s3c2416 affected by the same build issue

v1:
s3c2440.c fails to build if !CONFIG_PM because in such case
s3c2410_pm_syscore_ops is not defined. Same error should happen also
in s3c2410.c and s3c2442.c
Signed-off-by: NDomenico Andreoli <cavokz@gmail.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

* git://github.com/herbertx/crypto:
  crypto: ghash - Avoid null pointer dereference if no key is set