summaryrefslogtreecommitdiff
path: root/include/linux/power_supply.h
AgeCommit message (Collapse)Author
2008-09-05OLPC: power_supply: drop EMPTY from statusAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-05Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"Andres Salomon
This reverts commit 8efe444038a205e79b38b7ad03878824901849a8.
2008-09-04OLPC: power_supply: have status treat TRICKLE and CHARGING differentlyAndres Salomon
Spit out either "Charging" or "Charging (trickle)" depending upon whether or not TRICKLE is set. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-04OLPC: power_supply: add an 'error' property that displays raw errorsAndres Salomon
Grab the error code from EC_BAT_ERRCODE and let the user see it (rather than attempting to decode it as we do with PROP_HEALTH). Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-04OLPC: power_supply: replace CRITICAL with EMPTYAndres Salomon
As per richard's request, when the red LED comes on, let that state be known as EMPTY rather than CRITICAL. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-07-10power: olpc_battery: add a CRITICAL status, and have BAT_STAT_LOW set thatAndres Salomon
Add a POWER_SUPPLY_STATUS_DISCHARGING_CRITICAL value that means that the a battery is discharging and has reached critical levels. CRITICAL means that the EC could drop power at any time, and it has reached lower than manufacturer-recommend levels (ie, not charging may slowly shorten the lifespan of the battery). Set up the OLPC battery driver to use this when the EC sets the status to LOW. It should also coincide with the battery LED turning red. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-02-10Merge branch 'linux-2.6'Andres Salomon
Sloppiest merge ever. LXFB still needs to be updated, it will not build. Conflicts: Documentation/kernel-parameters.txt Documentation/power/basic-pm-debugging.txt Documentation/power/swsusp.txt Documentation/power_supply_class.txt Documentation/usb/persist.txt arch/i386/Kconfig arch/i386/kernel/Makefile arch/i386/kernel/head.S arch/i386/kernel/setup.c arch/i386/pci/Makefile arch/i386/pci/init.c arch/i386/pci/pci.h arch/powerpc/configs/pmac32_defconfig block/ll_rw_blk.c drivers/Kconfig drivers/base/dd.c drivers/hid/usbhid/hid-core.c drivers/input/keyboard/atkbd.c drivers/input/mouse/psmouse.h drivers/media/video/cafe_ccic.c drivers/misc/Kconfig drivers/misc/Makefile drivers/misc/eeprom_93cx6.c drivers/mmc/card/block.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_plx.c drivers/net/wireless/libertas/11d.c drivers/net/wireless/libertas/11d.h drivers/net/wireless/libertas/Makefile drivers/net/wireless/libertas/assoc.c drivers/net/wireless/libertas/assoc.h drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmdresp.c drivers/net/wireless/libertas/debugfs.c drivers/net/wireless/libertas/decl.h drivers/net/wireless/libertas/defs.h drivers/net/wireless/libertas/dev.h drivers/net/wireless/libertas/ethtool.c drivers/net/wireless/libertas/host.h drivers/net/wireless/libertas/hostcmd.h drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/libertas/if_usb.c drivers/net/wireless/libertas/if_usb.h drivers/net/wireless/libertas/join.c drivers/net/wireless/libertas/join.h drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/scan.c drivers/net/wireless/libertas/scan.h drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas/wext.c drivers/net/wireless/libertas/wext.h drivers/net/wireless/rtl8187.h drivers/net/wireless/rtl8187_dev.c drivers/net/wireless/rtl8187_rtl8225.c drivers/net/wireless/rtl8187_rtl8225.h drivers/net/wireless/rtl818x.h drivers/net/wireless/zd1211rw/Makefile drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/power/Kconfig drivers/power/Makefile drivers/power/apm_power.c drivers/power/ds2760_battery.c drivers/power/olpc_battery.c drivers/power/pda_power.c drivers/power/pmu_battery.c drivers/power/power_supply.h drivers/power/power_supply_core.c drivers/power/power_supply_leds.c drivers/power/power_supply_sysfs.c drivers/serial/serial_core.c drivers/usb/core/Kconfig drivers/usb/core/driver.c drivers/usb/core/generic.c drivers/usb/core/hcd.c drivers/usb/core/hcd.h drivers/usb/core/hub.c drivers/usb/host/ehci-hcd.c drivers/usb/host/ehci-q.c drivers/usb/host/ohci-pci.c drivers/usb/storage/usb.c drivers/video/geode/Kconfig drivers/video/geode/Makefile drivers/video/geode/lxfb.h drivers/video/geode/lxfb_core.c drivers/video/geode/lxfb_ops.c drivers/w1/slaves/w1_ds2760.c drivers/w1/slaves/w1_ds2760.h fs/Kconfig include/asm-i386/setup.h include/linux/console.h include/linux/eeprom_93cx6.h include/linux/i2c-id.h include/linux/pda_power.h include/linux/power_supply.h include/linux/suspend.h include/linux/usb.h include/linux/usb/quirks.h kernel/power/Kconfig kernel/printk.c kernel/time/timekeeping.c net/mac80211/ieee80211_ioctl.c scripts/kconfig/qconf.cc sound/pci/ac97/ac97_codec.c Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-02-05ACPI: battery: add sysfs serial numbermaximilian attems
egrep serial /proc/acpi/battery/BAT0/info serial number: 32090 serial number can tell you from the imminent danger of beeing set on fire. Signed-off-by: maximilian attems <max@stro.at> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
2008-02-02power_supply: add few more values and propsDmitry Baryshkov
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 <dbaryshkov@gmail.com> Signed-off-by: Anton Vorontsov <cbou@mail.ru>
2008-02-02power: remove POWER_SUPPLY_PROP_CAPACITY_LEVELAndres Salomon
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 <dilinger@debian.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2007-08-15[BATTERY] Add serial number and accumulated current registers to propertiesDavid Woodhouse
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2007-07-10[BATTERY] Universal power supply class (was: battery class)Anton Vorontsov
This class is result of "external power" and "battery" classes merge, as suggested by David Woodhouse. He also implemented uevent support. Here how userspace seeing it now: # ls /sys/class/power\ supply/ ac main-battery usb # cat /sys/class/power\ supply/ac/type AC # cat /sys/class/power\ supply/usb/type USB # cat /sys/class/power\ supply/main-battery/type Battery # cat /sys/class/power\ supply/ac/online 1 # cat /sys/class/power\ supply/usb/online 0 # cat /sys/class/power\ supply/main-battery/status Charging # cat /sys/class/leds/h5400\:red-left/trigger none h5400-radio timer hwtimer ac-online usb-online main-battery-charging-or-full [main-battery-charging] main-battery-full Signed-off-by: Anton Vorontsov <cbou@mail.ru> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2007-06-20[BATTERY] Add NiCd battery technologyDavid Woodhouse
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2007-06-20[BATTERY] Add LiFe battery type, extra error codes.David Woodhouse
We could probably do with a freeform text field for errors. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2007-06-20[BATTERY] Add 'manufacturer' property.David Woodhouse
Also fix power_supply_show_property() to recognise it as string type. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2007-05-09power_supply.h: use enums instead of definesAnton Vorontsov
Signed-off-by: Anton Vorontsov <cbou@mail.ru>
2007-05-09rename TYPE_AC to TYPE_MAINSAnton Vorontsov
Signed-off-by: Anton Vorontsov <cbou@mail.ru>
2007-05-09power_supply.h: should include workqueue.hAnton Vorontsov
Signed-off-by: Anton Vorontsov <cbou@mail.ru>
2007-05-09Universal power supply class (was: battery class)Anton Vorontsov
This class is result of "external power" and "battery" classes merge, as suggested by David Woodhouse. He also implemented uevent support. Here how userspace seeing it now: # ls /sys/class/power\ supply/ ac main-battery usb # cat /sys/class/power\ supply/ ac/ main-battery/ usb/ # cat /sys/class/power\ supply/ac/type AC # cat /sys/class/power\ supply/usb/type USB # cat /sys/class/power\ supply/main-battery/type Battery # cat /sys/class/power\ supply/ac/online 1 # cat /sys/class/power\ supply/usb/online 0 # cat /sys/class/power\ supply/main-battery/status Charging # cat /sys/class/leds/h5400\:red-left/trigger none h5400-radio timer hwtimer ac-online usb-online main-battery-charging-or-full [main-battery-charging] main-battery-full Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Anton Vorontsov <cbou@mail.ru>