diff options
| author | Dorian Snyder <dastin1015@gmail.com> | 2013-06-12 02:24:45 -0700 |
|---|---|---|
| committer | Dorian Snyder <dastin1015@gmail.com> | 2013-06-20 00:06:04 -0700 |
| commit | 4b2308ce699b9c599dd6e6acf57ac11f483381d9 (patch) | |
| tree | 4c31179b06d094887b1c8ca70264cf8f184a5981 /include | |
| parent | 855d6a6c1f7c54ef073caac3f6c5f9b1ed72eb4d (diff) | |
| download | kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.zip kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.gz kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.bz2 | |
d710: initial support for the Epic 4G Touch (SPH-D710)
Change-Id: Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/host.h | 4 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 10 | ||||
| -rw-r--r-- | include/linux/usb/quirks.h | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index df914ad..fcdb5f3 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -266,7 +266,11 @@ struct mmc_host { int clk_requests; /* internal reference counter */ unsigned int clk_delay; /* number of MCI clk hold cycles */ bool clk_gated; /* clock gated */ +#ifdef CONFIG_WIMAX_CMC + struct work_struct clk_gate_work; /* delayed clock gate */ +#else struct delayed_work clk_gate_work; /* delayed clock gate */ +#endif unsigned int clk_old; /* old clock value cache */ spinlock_t clk_lock; /* lock for clk fields */ struct mutex clk_gate_mutex; /* mutex for clock gating */ diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c5b958b..7a1653e 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -44,6 +44,7 @@ enum { POWER_SUPPLY_CHARGE_TYPE_NONE, POWER_SUPPLY_CHARGE_TYPE_TRICKLE, POWER_SUPPLY_CHARGE_TYPE_FAST, + POWER_SUPPLY_CHARGE_TYPE_SLOW, }; enum { @@ -128,17 +129,19 @@ enum power_supply_property { }; enum power_supply_type { - POWER_SUPPLY_TYPE_BATTERY = 0, + POWER_SUPPLY_TYPE_UNKNOWN = 0, + POWER_SUPPLY_TYPE_BATTERY, POWER_SUPPLY_TYPE_UPS, POWER_SUPPLY_TYPE_MAINS, POWER_SUPPLY_TYPE_USB, /* Standard Downstream Port */ POWER_SUPPLY_TYPE_USB_DCP, /* Dedicated Charging Port */ POWER_SUPPLY_TYPE_USB_CDP, /* Charging Downstream Port */ POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */ - POWER_SUPPLY_TYPE_OTG, POWER_SUPPLY_TYPE_DOCK, POWER_SUPPLY_TYPE_MISC, POWER_SUPPLY_TYPE_WIRELESS, + POWER_SUPPLY_TYPE_UARTOFF, + POWER_SUPPLY_TYPE_OTG, }; enum { @@ -255,6 +258,9 @@ extern struct power_supply *power_supply_get_by_name(char *name); extern void power_supply_changed(struct power_supply *psy); extern int power_supply_am_i_supplied(struct power_supply *psy); extern int power_supply_set_battery_charged(struct power_supply *psy); +extern int power_supply_set_current_limit(struct power_supply *psy, int limit); +extern int power_supply_set_online(struct power_supply *psy, bool enable); +extern int power_supply_set_charge_type(struct power_supply *psy, int type); #if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) extern int power_supply_is_system_supplied(void); diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h index ef75b0b..9ca6760 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -39,4 +39,7 @@ /* device needs hsic specific tunning */ #define USB_QUIRK_HSIC_TUNE 0x00000200 +/* resume bus driver after dpm resume */ +#define USB_QUIRK_NO_DPM_RESUME 0x00000400 + #endif /* __LINUX_USB_QUIRKS_H */ |