30 Jul, 2008
1 commit
-
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
26 Jul, 2008
1 commit
-
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf ("platform: prefix MODALIAS
with "platform:"), the platform modalias is prefixed with "platform:".
Add MODULE_ALIAS() to the hotpluggable "power" drivers drivers, to
re-enable auto loading.[dbrownell@users.sourceforge.net: one was missing]
Signed-off-by: Kay Sievers
Signed-off-by: David Brownell
Cc: Greg KH
Cc: "Rafael J. Wysocki"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
24 Jul, 2008
1 commit
-
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits)
[ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)
[ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)
[ARM] pxa: add base support for PXA930 (aka Tavor-P)
[ARM] Update mach-types
[ARM] pxa: make littleton to use the new smc91x platform data
[ARM] pxa: make zylonite to use the new smc91x platform data
[ARM] pxa: make mainstone to use the new smc91x platform data
[ARM] pxa: make lubbock to use new smc91x platform data
[NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
[NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable
[NET] smc91x: add SMC91X_NOWAIT flag to platform data
[NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*
[NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
[ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper
Support for LCD on e740 e750 e400 and e800 e-series PDAs
E-series UDC support
PXA UDC - allow use of inverted GPIO for pullup
Add e350 support
Fix broken e-series build
E-series GPIO / IRQ definitions.
...
22 Jul, 2008
1 commit
-
This mirrors the functionality that driver_for_each_device has as well.
We add a start variable, and all callers of the function are fixed up at
the same time.The block layer will be using this new functionality in a follow-on
patch.Cc: Kay Sievers
Signed-off-by: Greg Kroah-Hartman
10 Jul, 2008
1 commit
-
This patch adds battery monitoring driver for PalmTX.
It can read voltage from the battery and temperature.
It also monitors charging/discharging status.Signed-off-by: Marek Vasut
Signed-off-by: Russell King
01 Jul, 2008
1 commit
-
This patch adds common battery interface support for Sharp SL-6000 (tosa).
Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov
10 Jun, 2008
1 commit
-
Commit 54d29ad33e3483bcc7ca433a21cf294854e5154a (Power Supply: fix race
in device_create) introduced a race in power_supply_uevent. Previously it
checked that power_supply is available by checking for dev->driver_data.
But now dev->driver_data is set before power_supply->dev is initialised.Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov
21 May, 2008
1 commit
-
There is a race from when a device is created with device_create() and
then the drvdata is set with a call to dev_set_drvdata() in which a
sysfs file could be open, yet the drvdata will be NULL, causing all
sorts of bad things to happen.This patch fixes the problem by using the new function,
device_create_drvdata().Cc: Kay Sievers
Cc: Anton Vorontsov
Cc: David Woodhouse
Signed-off-by: Greg Kroah-Hartman
19 May, 2008
1 commit
-
As Richard Smith pointed out, ACR * 6250 / 15 provides for less
precision loss than ACR * 4167 / 10, _and_ it doesn't overflow. Switch
to using that equation for CHARGE_COUNTER.Signed-off-by: Andres Salomon
Cc: "Richard A. Smith"
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov
13 May, 2008
1 commit
-
This adds PROP_CHARGE_COUNTER to the power supply class (documenting it
as well). The OLPC battery driver uses this for spitting out its ACR
values (in uAh). We have some rounding errors (the data sheet claims
416.7, the math actually works out to 416.666667, so we're forced to
choose between overflows or precision loss. I chose precision loss,
and stuck w/ data sheet values), but I don't think anyone will care
that much.Signed-off-by: Andres Salomon
Signed-off-by: Anton Vorontsov
04 May, 2008
5 commits
-
Refuse to run with an EC < 0x44. We're playing it safe, and this is a pretty
old EC version.Also, add a comment about why we're checking the EC version.
Signed-off-by: Andres Salomon
Cc: David Woodhouse
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov -
Move portions of the massive switch statement into functions. The layout of
this thing has already caused one bug (a break in the wrong place), it needed
to shrink.Signed-off-by: Andres Salomon
Cc: David Woodhouse
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov -
This allows you to dump 0x60 bytes from the battery's EEPROM (starting at
address 0x20). Note that it does an EC command for each byte, so it's pretty
slow. OTOH, if you want to grab just a single byte from somewhere in the
EEPROM, you can do something like:dd bs=1 count=1 skip=16 if=/sys/class/power_supply/olpc-battery/eeprom | od -x
Userspace battery collection/logging information needs this.
Signed-off-by: Andres Salomon
Cc: David Woodhouse
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov -
This adds serial number support to the OLPC battery driver.
Signed-off-by: David Woodhouse
Signed-off-by: Andres Salomon
Signed-off-by: Anton Vorontsov -
* git://git.infradead.org/battery-2.6:
PMU battery: filenames in sysfs with spaces
pda_power: add init and exit function callbacks
03 May, 2008
2 commits
-
By changing drivers/power/pmu_battery.c I now have '_' instead of
' ' (spaces) in /sys:/sys/devices/platform/pmu-battery.0/power_supply/PMU_battery_0
/sys/class/power_supply/PMU_battery_0I'm still not sure if some userspace tool out there uses the old paths and
will break now.Signed-off-by: Christian Kujau
Signed-off-by: David Woodhouse
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov -
This adds init/exit function callbacks to pda_power, to
provide a place where the platform code can request/free
GPIOs that it wants to use in the is_ac_online, is_usb_online
and set_charge functions.Signed-off-by: Philipp Zabel
Signed-off-by: Anton Vorontsov
29 Apr, 2008
2 commits
-
This adds support for OLPC XO hardware. Open Firmware on XOs don't contain
the VSA, so it is necessary to emulate the PCI BARs in the kernel. This also
adds functionality for running EC commands, and a CONFIG_OLPC.A number of OLPC drivers depend upon CONFIG_OLPC.
olpc_ec_timeout is a hack to work around Embedded Controller bugs.
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: geode_has_vsa build fix]
[akpm@linux-foundation.org: olpc_register_battery_callback doesn't exist]
Signed-off-by: Andres Salomon
Acked-by: Ingo Molnar
Cc: Thomas Gleixner
Cc: Andi Kleen
Cc: Jordan Crouse
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison
Cc: Greg KH
Cc: "Rafael J. Wysocki"
Cc: Len Brown
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
08 Feb, 2008
2 commits
-
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (112 commits)
ACPI: fix build warning
Revert "cpuidle: build fix for non-x86"
ACPI: update intrd DSDT override console messages
ACPI: update DSDT override documentation
ACPI: Add "acpi_no_initrd_override" kernel parameter
ACPI: its a directory not a folder....
ACPI: misc cleanups
ACPI: add missing prink prefix strings
ACPI: cleanup acpi.h
ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
ACPI: video: Ignore ACPI video devices that aren't present in hardware
ACPI: video: reset brightness on resume
ACPI: video: call ACPI notifier chain for ACPI video notifications
ACPI: create notifier chain to get hotkey events to graphics driver
ACPI: video: delete unused display switch on hotkey event code
ACPI: video: create "brightness_switch_enabled" modparam
cpuidle: Add a poll_idle method
ACPI: cpuidle: Support C1 idle time accounting
ACPI: enable MWAIT for C1 idle
ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
... -
This commit:
commit 8efe444038a205e79b38b7ad03878824901849a8
Author: Andres Salomon
Date: Wed Dec 12 14:12:56 2007 -0500power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL
Removed CAPACITY_LEVEL from every other code, leaving the array with sysfs
attributes with one more entry than the number of enums in power_supply.h.
This leads to some attributes containing the value of the attribute right
after it. For example, temp_ambient would have the value of
time_to_empty_now. In my case, I had time_to_full_avg have the value which
should be in model_name, when the former was usually empty.Cc: Andres Salomon
Cc: David Woodhouse
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
06 Feb, 2008
1 commit
-
egrep serial /proc/acpi/battery/BAT0/info
serial number: 32090serial number can tell you from the imminent danger
of beeing set on fire.Signed-off-by: maximilian attems
Acked-by: Alexey Starikovskiy
Signed-off-by: Len Brown
02 Feb, 2008
11 commits
-
Signed-off-by: Anton Vorontsov
-
Signed-off-by: Anton Vorontsov
-
- handle spurious interrupts correctly;
- get rid of pda_power_supplies array, use two variables instead;
- factor out psy_changed() function, it will be used for polling.Signed-off-by: Anton Vorontsov
-
It's pretty dummy, but useful for batteries for which we can only
get voltages.Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov -
Add suspend/resume/wakeup support for pda_power.
Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov -
Add LiMn (one of the most common for small non-rechargable batteries)
battery technology and voltage_min/_max properties support.Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov -
Currently pda-power adds both ac and usb power supply units.
This patch fixes it so that psu are added only if they are enabled.Signed-off-by: Dmitry Baryshkov
Signed-off-by: Anton Vorontsov -
In power_supply_create_attrs(), we create static attributes as referenced
by power_supply_static_attrs[i]. After that, if we fail, we unregister
via power_supply_static_attrs[psy->properties[i]]. This is incorrect, as
psy->properties has absolutely no bearing on static attribs. This patch
fixes it to unregister the correct attrib.Another line which was unnecessarily line wrapped is also unwrapped.
Signed-off-by: Andres Salomon
Signed-off-by: David Woodhouse -
The CAPACITY_LEVEL stuff defines various levels of charge; however, what
is the difference between them? What differentiates between HIGH and NORMAL,
LOW and CRITICAL, etc?As it appears that these are fairly arbitrary, we end up making such policy
decisions in the kernel (or in hardware). This is the sort of decision that
should be made in userspace, not in the kernel.If the hardware does not support _CAPACITY and it cannot be easily calculated,
then perhaps the driver should register a custom CAPACITY_LEVEL attribute;
however, userspace should not become accustomed to looking for such a thing,
and we should certainly not encourage drivers to provide CAPACITY_LEVEL
stubs.The following removes support for POWER_SUPPLY_PROP_CAPACITY_LEVEL. The
OLPC battery driver is the only driver making use of this, so it's
removed from there as well.Signed-off-by: Andres Salomon
Signed-off-by: David Woodhouse -
Use kasprintf instead of kmalloc()-strcpy()-strcat().
Cc: Anton Vorontsov
Cc: David Woodhouse
Signed-off-by: Akinobu Mita
Signed-off-by: Anton Vorontsov -
Signed-off-by: Adrian Bunk
Signed-off-by: Andrew Morton
Signed-off-by: Anton Vorontsov
25 Jan, 2008
1 commit
-
Convert to use the class iteration api.
Signed-off-by: Dave Young
Cc: Anton Vorontsov
Cc: David Woodhouse
Signed-off-by: Greg Kroah-Hartman
23 Oct, 2007
1 commit
-
* git://git.infradead.org/battery-2.6:
apm_power: calculate to_full/to_empty time using energy
apm_power: improve battery finding algorithm
apm_power: fix obviously wrong logic for time reporting
19 Oct, 2007
1 commit
-
Found these while looking at printk uses.
Add missing newlines to dev_ uses
Add missing KERN_ prefixes to multiline dev_s
Fixed a wierd->weird spelling typo
Added a newline to a printkSigned-off-by: Joe Perches
Cc: "Luck, Tony"
Cc: Jens Axboe
Cc: Mark M. Hoffman
Cc: Roland Dreier
Cc: Tilman Schmidt
Cc: David Woodhouse
Cc: Jeff Garzik
Cc: Stephen Hemminger
Cc: Greg KH
Cc: Jeremy Fitzhardinge
Cc: Geert Uytterhoeven
Cc: Alessandro Zummo
Cc: David Brownell
Cc: James Smart
Cc: Andrew Vasquez
Cc: "Antonino A. Daplas"
Cc: Evgeniy Polyakov
Cc: Russell King
Cc: Jaroslav Kysela
Cc: Takashi Iwai
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
13 Oct, 2007
1 commit
-
This changes the uevent buffer functions to use a struct instead of a
long list of parameters. It does no longer require the caller to do the
proper buffer termination and size accounting, which is currently wrong
in some places. It fixes a known bug where parts of the uevent
environment are overwritten because of wrong index calculations.Many thanks to Mathieu Desnoyers for finding bugs and improving the
error handling.Signed-off-by: Kay Sievers
Cc: Mathieu Desnoyers
Cc: Cornelia Huck
Signed-off-by: Greg Kroah-Hartman
05 Oct, 2007
3 commits
-
This patch adds ability to calculate time using energy.
Needed to calculate time_to_full for PMU batteries.Signed-off-by: Anton Vorontsov
-
Prior to this patch, if use_for_apm unspecified, apm_power able
to choice batteries according to their charge only.This patch adds ability to choice batteries according to their charge,
energy, use_for_apm flag, and fallback to any battery if it failed to
decide.Patch is mandatory to report Apple PMU batteries through legacy
/proc/apm interface using power supply class.Signed-off-by: Anton Vorontsov
-
Prior to this patch, apm_power was unable to report "to empty"/"to full"
time for batteries that hardware-report these values, such as
Apple PMU batteries.Signed-off-by: Anton Vorontsov
