29 Oct, 2010
1 commit
-
The missing definitions are now in.
This reverts commit 23886839a752401aba66517bff8a8b91549279ce.
Signed-off-by: Samuel Ortiz
28 Oct, 2010
1 commit
-
The driver is not buildable without MFD changes. For now, let's
disable the driver as it breaks build for major platforms (i.e. x86).CC [M] drivers/power/twl4030_charger.o
drivers/power/twl4030_charger.c: In function 'twl4030_clear_set_boot_bci':
drivers/power/twl4030_charger.c:105: error: 'TWL4030_PM_MASTER_BOOT_BCI' undeclared (first use in this function)
drivers/power/twl4030_charger.c:105: error: (Each undeclared identifier is reported only once
drivers/power/twl4030_charger.c:105: error: for each function it appears in.)
drivers/power/twl4030_charger.c: In function 'twl4030_bci_have_vbus':
drivers/power/twl4030_charger.c:137: error: 'TWL4030_PM_MASTER_STS_HW_CONDITIONS' undeclared (first use in this function)
drivers/power/twl4030_charger.c: In function 'twl4030_bci_probe':
drivers/power/twl4030_charger.c:477: warning: overflow in implicit constant conversion
drivers/power/twl4030_charger.c:485: warning: overflow in implicit constant conversion
make[2]: *** [drivers/power/twl4030_charger.o] Error 1We can re-enable it if MFD tree will finally merge into 2.6.37.
Reported-by: Ingo Molnar
Signed-off-by: Anton Vorontsov
27 Oct, 2010
1 commit
-
* git://git.infradead.org/battery-2.6:
power_supply: Makefile cleanup
bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()
power_supply: Introduce maximum current property
power_supply: Add types for USB chargers
ds2782_battery: Fix units
power_supply: Add driver for TWL4030/TPS65950 BCI charger
bq20z75: Add support for more power supply properties
wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()
jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()
olpc_battery: Fix endian neutral breakage for s16 values
ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency
pcf50633-charger: Add missing sysfs_remove_group()
power_supply: Add driver for TI BQ20Z75 gas gauge IC
wm831x_power: Remove duplicate chg mask
omap: rx51: Add support for USB chargers
power_supply: Add isp1704 charger detection driver
06 Oct, 2010
5 commits
-
Replace EXTRA_CFLAGS with ccflags-y; remove if-statements and replace
with lists using the kbuild idiom.None of the dependencies are modified.
Signed-off-by: matt mooney
Signed-off-by: Anton Vorontsov -
Signed-off-by: Axel Lin
Signed-off-by: Anton Vorontsov -
USB only gives the maximum current allowed to draw.
Signed-off-by: Heikki Krogerus
Signed-off-by: Anton Vorontsov -
This adds power supply types for USB chargers defined in
Battery Charging Specification 1.1.Signed-off-by: Heikki Krogerus
Signed-off-by: Anton Vorontsov -
Correct the unit names in the ds2782 battery driver. Changes voltage_uA
to voltage_uV and capacity_uA to capacity.Signed-off-by: Ryan Mallon
Cc: Geert Uytterhoeven
Cc: David Woodhouse
Cc: Ben Hutchings
Cc: Yulia Vilensky
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov
30 Sep, 2010
1 commit
-
TWL4030/TPS65950 is a multi-function device with integrated charger,
which allows charging from AC or USB. This driver enables the charger
and provides several monitoring functions.Tested on OMAP3 Pandora board.
Signed-off-by: Grazvydas Ignotas
Acked-by: Felipe Balbi
Signed-off-by: Anton Vorontsov
28 Sep, 2010
5 commits
-
This patch adds properties to support devicekit power. Also, create IO
wrapper functions and fix some issues found while testing, including
unit conversions to match the power_supply types.Signed-off-by: Rhyland Klein
Signed-off-by: Anton Vorontsov -
Signed-off-by: Axel Lin
Acked-by: Mark Brown
Signed-off-by: Anton Vorontsov -
Signed-off-by: Axel Lin
Acked-By: Lars-Peter Clausen
Signed-off-by: Anton Vorontsov -
Signed-off-by: Axel Lin
Signed-off-by: Anton Vorontsov -
When the driver was updated to be endian neutral (8e9c7716c)
the signed part of the s16 values was lost. This is because be16_to_cpu()
returns an unsigned value. This patch casts the values back to a s16
number prior to the the implicit cast up to an int.Signed-off-by: Richard A. Smith
Signed-off-by: Daniel Drake
Cc:
Signed-off-by: Anton Vorontsov
23 Sep, 2010
1 commit
-
Fix this Kconfig warning on allmodconfig for s390:
warning: (BATTERY_DS2760 && POWER_SUPPLY) selects W1 which has unmet
direct dependencies (HAS_IOMEM)Signed-off-by: Martin Schwidefsky
Signed-off-by: Anton Vorontsov
22 Sep, 2010
1 commit
-
sysfs entries should be removed when unload the module.
Signed-off-by: Axel Lin
Signed-off-by: Anton Vorontsov
08 Sep, 2010
1 commit
-
The missing break statement causes wrong capacity calculation for
batteries that report energy.Reported-by: d binderman
Cc:
Signed-off-by: Anton Vorontsov
06 Sep, 2010
1 commit
-
This driver depends on I2C and uses SMBUS for communication with
the host.Signed-off-by: Rhyland Klein
Reviewed-by: Mark Brown
Reviewed-by: Jean Delvare
Signed-off-by: Anton Vorontsov
02 Sep, 2010
1 commit
-
Reported-by: Julia Lawall
Signed-off-by: Ian Lartey
Acked-by: Mark Brown
Signed-off-by: Anton Vorontsov
24 Aug, 2010
1 commit
-
The arguments got swapped on some functions which produces undefined results.
The main one got fixed before submit but the other two were missed.Signed-off-by: Shuduo Sang
Signed-off-by: Alan Cox
Signed-off-by: Anton Vorontsov
19 Aug, 2010
1 commit
-
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: Heikki Krogerus
Signed-off-by: Anton Vorontsov
13 Aug, 2010
1 commit
-
* git://git.infradead.org/battery-2.6:
intel_mid_battery: Fix battery scaling
intel_mid_battery: Fix the argument order to intel_scu_ipc_command
olpc_battery: Fix build failure caused by sysfs changes
Add s3c-adc-battery driver
Intel MID platform battery driverFix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
12 Aug, 2010
1 commit
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
ARM: 6322/1: imx/pca100: Fix name of spi platform data
ARM: 6321/1: fix syntax error in main Kconfig file
ARM: 6297/1: move U300 timer to dynamic clock lookup
ARM: 6296/1: clock U300 intcon and timer properly
ARM: 6295/1: fix U300 apb_pclk split
ARM: 6306/1: fix inverted MMC card detect in U300
ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
ARM: 6292/1: coresight: add ETM management registers
ARM: 6288/1: ftrace: document mcount formats
ARM: 6287/1: ftrace: clean up mcount assembly indentation
ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
ARM: 6280/1: imx: Fix build failure when including without
ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
ARM: S5PV210: Override FIMC driver name on Aquila board
ARM: S5PC100: enable FIMC on SMDKC100
...Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
11 Aug, 2010
1 commit
-
Signed-off-by: Guenter Roeck
Signed-off-by: Linus Torvalds
10 Aug, 2010
3 commits
-
There are 3600 seconds per not 3600 hours per second. Correcting this
along with the previous fix gives sensible numbers.Signed-off-by: Alan Cox
Signed-off-by: Anton Vorontsov -
The arguments to intel_scu_ipc_command are "command, subcommand"
the battery driver got this the wrong way around.Signed-off-by: Arjan van de Ven
Signed-off-by: Alan Cox
Signed-off-by: Anton Vorontsov -
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: David Woodhouse
07 Aug, 2010
1 commit
-
…-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
05 Aug, 2010
2 commits
-
Add support for the battery voltage measurement part of the JZ4740 ADC unit.
Signed-off-by: Lars-Peter Clausen
Acked-by: Anton Vorontsov
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1416/
Signed-off-by: Ralf Baechle -
Signed-off-by: Marek Vasut
Acked-by: Mark Brown
Signed-off-by: Eric Miao
28 Jul, 2010
1 commit
-
* git://git.infradead.org/users/cbou/battery-2.6.35:
ds2782_battery: Rename get_current to fix build failure / name conflict
23 Jul, 2010
1 commit
-
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: Vasily Khoruzhick
Signed-off-by: Anton Vorontsov
20 Jul, 2010
1 commit
-
* git://git.infradead.org/users/cbou/battery-2.6.35:
ds2782_battery: Fix ds2782_get_capacity return value
21 Jun, 2010
1 commit
-
The ds2782_get_capacity function should return 0 on success, not the
capacity value.Signed-off-by: Ryan Mallon
Signed-off-by: Anton Vorontsov
18 Jun, 2010
1 commit
-
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: Nithish Mahalingam
Signed-off-by: Alan Cox
Signed-off-by: Anton Vorontsov
14 Jun, 2010
1 commit
-
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 justThis patch fixes the issue. To be consistent the other function pointers
(_voltage,_capacity) were renamed too.Signed-off-by: Peter Huewe
Acked-by: Ryan Mallon
Acked-by: Mike Rapoport
Signed-off-by: Anton Vorontsov
13 Jun, 2010
1 commit
-
Remove redundant includes and add slab.h to fix problem with building.
Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
03 Jun, 2010
1 commit
-
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
e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 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: Wolfram Sang
Acked-by: Mark Brown
Acked-by: Greg Kroah-Hartman
Acked-by: Richard Purdie
Acked-by: Dmitry Torokhov
Signed-off-by: Jean Delvare
25 May, 2010
2 commits
-
* git://git.infradead.org/battery-2.6:
power_supply: Fix regression for 'type' property -
Commit 5f487cd34f4337f9bc27ca19da72a39d1b0a0ab4 (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: Rafael J. Wysocki
Signed-off-by: Daniel Mack
Tested-by: Rafael J. Wysocki
Signed-off-by: Anton Vorontsov
