diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:51 +0000 |
| commit | 91621be2cbfa8140a14d7ca4c1cf7de32368273c (patch) | |
| tree | 6a13ac5ca670ada8b68501eab22a73817512c4ef /include | |
| parent | 2775b40e6679a921c5ecab729e021176fef56fb6 (diff) | |
fix-pcf50633-migrate-gta02-peripherals-out.patch
pcf50633.c shouldn't know GTAxx at all. Move to using a
platform callback to allow definition of platform devices
with pcf50633 as parent device (good for enforcing suspend /
resume ordering). Remove all code references to GTAxx from
the sources (one string left for compatability).
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pcf50633.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h index b94b72a579f..4653285037d 100644 --- a/include/linux/pcf50633.h +++ b/include/linux/pcf50633.h @@ -132,7 +132,9 @@ pcf50633_register_resume_dependency(struct pcf50633_data *pcf, extern int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf, unsigned int ma); - +extern int +pcf50633_wait_for_ready(struct pcf50633_data *pcf, int timeout_ms, + char *name); /* 0 = initialized and resumed and ready to roll, !=0 = either not * initialized or not resumed yet @@ -155,6 +157,10 @@ struct pcf50633_platform_data { unsigned int onkey_seconds_sig_init; unsigned int onkey_seconds_shutdown; + /* callback to attach platform children (to enforce suspend / resume + * ordering */ + void (*attach_child_devices)(struct device *parent_device); + /* voltage regulator related */ struct pmu_voltage_rail rails[__NUM_PCF50633_REGULATORS]; unsigned int used_regulators; @@ -163,6 +169,7 @@ struct pcf50633_platform_data { unsigned int r_fix_batt; unsigned int r_fix_batt_par; unsigned int r_sense_milli; + int flag_use_apm_emulation; unsigned char resumers[5]; |