Merge git://git.infradead.org/~dwmw2/battery-2.6

* git://git.infradead.org/~dwmw2/battery-2.6:
  [BATTERY] ds2760 W1 slave
  [BATTERY] One Laptop Per Child power/battery driver
  [BATTERY] Apple PMU driver
  [BATTERY] 1-Wire ds2760 chip battery driver
  [BATTERY] APM emulation driver for class batteries
  [BATTERY] pda_power platform driver
  [BATTERY] Universal power supply class (was: battery class)

2 files changed, 211 insertions, 0 deletions

diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
new file mode 100644
index 000000000000..1375f15797e7
--- /dev/null
+++ b/include/linux/pda_power.h
@@ -0,0 +1,31 @@
+/*
+ * Common power driver for PDAs and phones with one or two external
+ * power supplies (AC/USB) connected to main and backup batteries,
+ * and optional builtin charger.
+ *
+ * Copyright © 2007 Anton Vorontsov <cbou@mail.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __PDA_POWER_H__
+#define __PDA_POWER_H__
+
+#define PDA_POWER_CHARGE_AC  (1 << 0)
+#define PDA_POWER_CHARGE_USB (1 << 1)
+
+struct pda_power_pdata {
+        int (*is_ac_online)(void);
+        int (*is_usb_online)(void);
+        void (*set_charge)(int flags);
+
+        char **supplied_to;
+        size_t num_supplicants;
+
+        unsigned int wait_for_status; /* msecs, default is 500 */
+        unsigned int wait_for_charger; /* msecs, default is 500 */
+};
+
+#endif /* __PDA_POWER_H__ */
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
new file mode 100644
index 000000000000..606c0957997f
--- /dev/null
+++ b/include/linux/power_supply.h
@@ -0,0 +1,180 @@
+/*
+ *  Universal power supply monitor class
+ *
+ *  Copyright © 2007  Anton Vorontsov <cbou@mail.ru>
+ *  Copyright © 2004  Szabolcs Gyurko
+ *  Copyright © 2003  Ian Molton <spyro@f2s.com>
+ *
+ *  Modified: 2004, Oct     Szabolcs Gyurko
+ *
+ *  You may use this code as per GPL version 2
+ */
+
+#ifndef __LINUX_POWER_SUPPLY_H__
+#define __LINUX_POWER_SUPPLY_H__
+
+#include <linux/device.h>
+#include <linux/workqueue.h>
+#include <linux/leds.h>
+
+/*
+ * All voltages, currents, charges, energies, time and temperatures in uV,
+ * µA, µAh, µWh, seconds and tenths of degree Celsius unless otherwise
+ * stated. It's driver's job to convert its raw values to units in which
+ * this class operates.
+ */
+
+/*
+ * For systems where the charger determines the maximum battery capacity
+ * the min and max fields should be used to present these values to user
+ * space. Unused/unknown fields will not appear in sysfs.
+ */
+
+enum {
+        POWER_SUPPLY_STATUS_UNKNOWN = 0,
+        POWER_SUPPLY_STATUS_CHARGING,
+        POWER_SUPPLY_STATUS_DISCHARGING,
+        POWER_SUPPLY_STATUS_NOT_CHARGING,
+        POWER_SUPPLY_STATUS_FULL,
+};
+
+enum {
+        POWER_SUPPLY_HEALTH_UNKNOWN = 0,
+        POWER_SUPPLY_HEALTH_GOOD,
+        POWER_SUPPLY_HEALTH_OVERHEAT,
+        POWER_SUPPLY_HEALTH_DEAD,
+        POWER_SUPPLY_HEALTH_OVERVOLTAGE,
+        POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
+};
+
+enum {
+        POWER_SUPPLY_TECHNOLOGY_UNKNOWN = 0,
+        POWER_SUPPLY_TECHNOLOGY_NiMH,
+        POWER_SUPPLY_TECHNOLOGY_LION,
+        POWER_SUPPLY_TECHNOLOGY_LIPO,
+        POWER_SUPPLY_TECHNOLOGY_LiFe,
+        POWER_SUPPLY_TECHNOLOGY_NiCd,
+};
+
+enum {
+        POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0,
+        POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL,
+        POWER_SUPPLY_CAPACITY_LEVEL_LOW,
+        POWER_SUPPLY_CAPACITY_LEVEL_NORMAL,
+        POWER_SUPPLY_CAPACITY_LEVEL_HIGH,
+        POWER_SUPPLY_CAPACITY_LEVEL_FULL,
+};
+
+enum power_supply_property {
+        /* Properties of type `int' */
+        POWER_SUPPLY_PROP_STATUS = 0,
+        POWER_SUPPLY_PROP_HEALTH,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_EMPTY,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_CHARGE_AVG,
+        POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+        POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
+        POWER_SUPPLY_PROP_ENERGY_FULL,
+        POWER_SUPPLY_PROP_ENERGY_EMPTY,
+        POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_ENERGY_AVG,
+        POWER_SUPPLY_PROP_CAPACITY, /* in percents! */
+        POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_TEMP_AMBIENT,
+        POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
+        POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
+        POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
+        POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,
+        /* Properties of type `const char *' */
+        POWER_SUPPLY_PROP_MODEL_NAME,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
+
+enum power_supply_type {
+        POWER_SUPPLY_TYPE_BATTERY = 0,
+        POWER_SUPPLY_TYPE_UPS,
+        POWER_SUPPLY_TYPE_MAINS,
+        POWER_SUPPLY_TYPE_USB,
+};
+
+union power_supply_propval {
+        int intval;
+        const char *strval;
+};
+
+struct power_supply {
+        const char *name;
+        enum power_supply_type type;
+        enum power_supply_property *properties;
+        size_t num_properties;
+
+        char **supplied_to;
+        size_t num_supplicants;
+
+        int (*get_property)(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            union power_supply_propval *val);
+        void (*external_power_changed)(struct power_supply *psy);
+
+        /* For APM emulation, think legacy userspace. */
+        int use_for_apm;
+
+        /* private */
+        struct device *dev;
+        struct work_struct changed_work;
+
+#ifdef CONFIG_LEDS_TRIGGERS
+        struct led_trigger *charging_full_trig;
+        char *charging_full_trig_name;
+        struct led_trigger *charging_trig;
+        char *charging_trig_name;
+        struct led_trigger *full_trig;
+        char *full_trig_name;
+        struct led_trigger *online_trig;
+        char *online_trig_name;
+#endif
+};
+
+/*
+ * This is recommended structure to specify static power supply parameters.
+ * Generic one, parametrizable for different power supplies. Power supply
+ * class itself does not use it, but that's what implementing most platform
+ * drivers, should try reuse for consistency.
+ */
+
+struct power_supply_info {
+        const char *name;
+        int technology;
+        int voltage_max_design;
+        int voltage_min_design;
+        int charge_full_design;
+        int charge_empty_design;
+        int energy_full_design;
+        int energy_empty_design;
+        int use_for_apm;
+};
+
+extern void power_supply_changed(struct power_supply *psy);
+extern int power_supply_am_i_supplied(struct power_supply *psy);
+
+extern int power_supply_register(struct device *parent,
+                                 struct power_supply *psy);
+extern void power_supply_unregister(struct power_supply *psy);
+
+/* For APM emulation, think legacy userspace. */
+extern struct class *power_supply_class;
+
+#endif /* __LINUX_POWER_SUPPLY_H__ */