diff options
| author | merge <null@invalid> | 2008-12-08 22:56:05 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-08 22:56:05 +0000 |
| commit | c59a8bdc7ca4b5470ebc43dfc31ed1d3d23a7c6f (patch) | |
| tree | 12f561fcb8f9e05e4edfe97d3a715ef7755ad5ba /include/linux | |
| parent | ebb3f320edcc6c4665a71ea060ef2ce6a83402b0 (diff) | |
MERGE-andy-tracking-patchset-edits-revert-power-patches
Whoops this is just reverting a couple of patches that
were not ready to be committed yet.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 7 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/mbc.h | 13 |
2 files changed, 1 insertions, 19 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 4ee3f527172..bf107d3794e 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -34,8 +34,6 @@ struct pcf50633_platform_data { char **batteries; int num_batteries; - int good_main_battery_adc_threshold; - /* Callbacks */ void (*probe_done)(struct pcf50633 *); void (*mbc_event_callback)(struct pcf50633 *, int); @@ -80,7 +78,6 @@ int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 bits); #define PCF50633_REG_INT3M 0x09 #define PCF50633_REG_INT4M 0x0a #define PCF50633_REG_INT5M 0x0b -#define PCF50633_REG_OOSHDWN 0x0c enum { /* Chip IRQs */ @@ -125,10 +122,8 @@ enum { PCF50633_IRQ_HCLDOPWRFAIL, PCF50633_IRQ_HCLDOOVL, - /* Always last of real IRQs */ + /* Always last */ PCF50633_NUM_IRQ, - /* fake IRQ */ - PCF50633_ABOUT_TO_INCREASE_POWER }; struct pcf50633 { diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h index a1cd44957ac..9a7938ad132 100644 --- a/include/linux/mfd/pcf50633/mbc.h +++ b/include/linux/mfd/pcf50633/mbc.h @@ -15,7 +15,6 @@ #include <linux/platform_device.h> -#define PCF50633_REG_BVMCTL 0x19 #define PCF50633_REG_MBCC1 0x43 #define PCF50633_REG_MBCC2 0x44 #define PCF50633_REG_MBCC3 0x45 @@ -123,18 +122,6 @@ struct pcf50633; void pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma); -enum pcf50633_power_avail { - PCF50633_PA_DEAD_BATTERY_ONLY, - PCF50633_PA_LIVE_BATTERY_ONLY, - PCF50633_PA_ADAPTER, - PCF50633_PA_USB_100mA_AND_LIVE_BATTERY, - PCF50633_PA_USB_100mA_AND_DEAD_BATTERY, - PCF50633_PA_USB_500mA, - PCF50633_PA_USB_1A -}; - -enum pcf50633_power_avail pcf50633_check_power_available(struct pcf50633 *pcf); - struct pcf50633_mbc { int adapter_active; int adapter_online; |