aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:59:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:59:33 -0800
commit48e902f0a3aea4b6b3a73e9d277b92024a493e6d (patch)
tree6dbb3a4c5ab4e7fc72172d8c11e7c0418b6559d1 /include
parent7f6cd5408a8ace522ca7f15893243e94ccc913e0 (diff)
parent9d233e8bb92e355fd20b14745c1d9ff402e0e685 (diff)
downloadkernel_samsung_tuna-48e902f0a3aea4b6b3a73e9d277b92024a493e6d.zip
kernel_samsung_tuna-48e902f0a3aea4b6b3a73e9d277b92024a493e6d.tar.gz
kernel_samsung_tuna-48e902f0a3aea4b6b3a73e9d277b92024a493e6d.tar.bz2
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply_sysfs: Handle -ENODATA in a special way wm831x_backup: Remove unused variables gta02: Set pcf50633 charger_reference_current_ma pcf50633: Query charger status directly pcf50633: Properly reenable charging when the supply conditions change pcf50633: Get rid of charging restart software auto-triggering pcf50633: introduces battery charging current control pcf50633: Add ac power supply class to the charger wm831x: Factor out WM831x backup battery charger
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/pcf50633/core.h7
-rw-r--r--include/linux/mfd/pcf50633/mbc.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index d9034cc..3398bd9 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -29,7 +29,12 @@ struct pcf50633_platform_data {
char **batteries;
int num_batteries;
- int charging_restart_interval;
+ /*
+ * Should be set accordingly to the reference resistor used, see
+ * I_{ch(ref)} charger reference current in the pcf50633 User
+ * Manual.
+ */
+ int charger_reference_current_ma;
/* Callbacks */
void (*probe_done)(struct pcf50633 *);
diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h
index 4119579..df4f5fa 100644
--- a/include/linux/mfd/pcf50633/mbc.h
+++ b/include/linux/mfd/pcf50633/mbc.h
@@ -128,6 +128,7 @@ enum pcf50633_reg_mbcs3 {
int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);
int pcf50633_mbc_get_status(struct pcf50633 *);
+int pcf50633_mbc_get_usb_online_status(struct pcf50633 *);
#endif