From cb93f68cb9ab19d9647962568b4c895548a869e8 Mon Sep 17 00:00:00 2001 From: sbrissen Date: Fri, 21 Jun 2013 07:40:19 -0400 Subject: smdk4412: add i925/p4noteltevzw support Change-Id: I17d3befd6a6538c16db0675253927068a09085c6 --- include/linux/30pin_con.h | 11 +++++++++++ include/linux/battery/sec_battery.h | 14 +++++++++++++- include/linux/mdm_hsic_pm.h | 6 ++++++ include/linux/msm_charm.h | 4 ++++ include/linux/power/max17042_fuelgauge_px.h | 2 ++ include/linux/power/smb347_charger.h | 3 +++ include/linux/power_supply.h | 1 + 7 files changed, 40 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/30pin_con.h b/include/linux/30pin_con.h index 9e3a4c1..b356155 100644 --- a/include/linux/30pin_con.h +++ b/include/linux/30pin_con.h @@ -26,10 +26,16 @@ struct sec_keyboard_platform_data { int (*wakeup_key)(void); void (*check_uart_path)(bool en); void (*acc_power)(u8 token, bool active); + int (*noti_univ_kbd_dock)(unsigned int code); void (*register_cb)(struct sec_keyboard_callbacks *cb); }; #endif +struct sec_30pin_callbacks { + int (*noti_univ_kdb_dock)(struct sec_30pin_callbacks *cb, + unsigned int code); +}; + struct acc_con_platform_data { void (*otg_en) (int active); void (*acc_power) (u8 token, bool active); @@ -37,6 +43,7 @@ struct acc_con_platform_data { int (*get_acc_state)(void); int (*get_dock_state)(void); int (*check_keyboard)(bool attached); + void (*register_cb)(struct sec_30pin_callbacks *cb); int accessory_irq_gpio; int dock_irq_gpio; int mhl_irq_gpio; @@ -48,6 +55,10 @@ u16 stmpe811_get_adc_data(u8 channel); #endif extern struct device *sec_switch_dev; +#ifdef CONFIG_MACH_P4NOTE +extern void host_notifier_enable_irq(void); +extern void host_notifier_disable_irq(void); +#endif #ifdef CONFIG_SAMSUNG_MHL_9290 int acc_register_notifier(struct notifier_block *nb); #endif diff --git a/include/linux/battery/sec_battery.h b/include/linux/battery/sec_battery.h index 4c57e62..70a5c50 100644 --- a/include/linux/battery/sec_battery.h +++ b/include/linux/battery/sec_battery.h @@ -99,7 +99,8 @@ struct sec_battery_info { /* event set */ unsigned int event; unsigned int event_wait; - struct timer_list event_expired_timer; + struct alarm event_termination_alarm; + ktime_t last_event_time; /* battery check */ unsigned int check_count; @@ -130,13 +131,16 @@ struct sec_battery_info { /* charging */ unsigned int charging_mode; int cable_type; + int extended_cable_type; struct wake_lock cable_wake_lock; struct work_struct cable_work; struct wake_lock vbus_wake_lock; unsigned int full_check_cnt; + unsigned int recharge_check_cnt; /* test mode */ bool test_activated; + bool factory_mode; }; static char *supply_list[] = { @@ -192,10 +196,14 @@ static struct device_attribute sec_battery_attrs[] = { SEC_BATTERY_ATTR(batt_charging_source), SEC_BATTERY_ATTR(fg_reg_dump), SEC_BATTERY_ATTR(fg_reset_cap), + SEC_BATTERY_ATTR(fg_capacity), SEC_BATTERY_ATTR(auth), SEC_BATTERY_ATTR(chg_current_adc), SEC_BATTERY_ATTR(wc_adc), SEC_BATTERY_ATTR(wc_status), + SEC_BATTERY_ATTR(factory_mode), + SEC_BATTERY_ATTR(update), + SEC_BATTERY_ATTR(test_mode), SEC_BATTERY_ATTR(2g_call), SEC_BATTERY_ATTR(3g_call), @@ -232,10 +240,14 @@ enum { BATT_CHARGING_SOURCE, FG_REG_DUMP, FG_RESET_CAP, + FG_CAPACITY, AUTH, CHG_CURRENT_ADC, WC_ADC, WC_STATUS, + FACTORY_MODE, + UPDATE, + TEST_MODE, BATT_EVENT_2G_CALL, BATT_EVENT_3G_CALL, diff --git a/include/linux/mdm_hsic_pm.h b/include/linux/mdm_hsic_pm.h index 6388074..ce035dc 100644 --- a/include/linux/mdm_hsic_pm.h +++ b/include/linux/mdm_hsic_pm.h @@ -15,6 +15,8 @@ void set_host_stat(const char *name, enum pwr_stat status); int wait_dev_pwr_stat(const char *name, enum pwr_stat status); int check_udev_suspend_allowed(const char *name); bool check_request_blocked(const char *name); +int pm_dev_runtime_get_enabled(struct usb_device *udev); +int pm_dev_wait_lpa_wake(void); /*add wakelock interface for fast dormancy*/ #ifdef CONFIG_HAS_WAKELOCK @@ -39,7 +41,11 @@ int register_udev_to_pm_dev(const char *name, struct usb_device *udev); */ void unregister_udev_from_pm_dev(const char *name, struct usb_device *udev); +int set_qmicm_mode(const char *name); + extern struct blocking_notifier_head mdm_reset_notifier_list; extern void mdm_force_fatal(void); +extern void print_mdm_gpio_state(void); extern bool lpa_handling; +extern int hello_packet_rx; #endif /* __MDM_HSIC_PM_H__ */ diff --git a/include/linux/msm_charm.h b/include/linux/msm_charm.h index 3695643..4767c41 100644 --- a/include/linux/msm_charm.h +++ b/include/linux/msm_charm.h @@ -16,6 +16,10 @@ #define GET_FORCE_RAMDUMP _IOW(CHARM_CODE, 11, int) #define WAIT_FOR_ERROR _IOW(CHARM_CODE, 12, int) +#ifdef CONFIG_SIM_DETECT +#define GET_SIM_DETECT _IOW(CHARM_CODE, 13, int) +#endif + enum charm_boot_type { CHARM_NORMAL_BOOT = 0, CHARM_RAM_DUMPS, diff --git a/include/linux/power/max17042_fuelgauge_px.h b/include/linux/power/max17042_fuelgauge_px.h index 11e8ce8..c618e4d 100644 --- a/include/linux/power/max17042_fuelgauge_px.h +++ b/include/linux/power/max17042_fuelgauge_px.h @@ -61,6 +61,7 @@ #define FG_CHECK_STATUS 6 #define FG_VF_SOC 7 #define FG_VOLTAGE_NOW 8 +#define FG_RAW_LEVEL 9 #define LOW_BATT_COMP_RANGE_NUM 5 #define LOW_BATT_COMP_LEVEL_NUM 2 @@ -375,6 +376,7 @@ extern int fg_alert_init(void); extern void fg_fullcharged_compensation(u32 is_recharging, u32 pre_update); extern void fg_check_vf_fullcap_range(void); extern int fg_check_cap_corruption(void); +extern int fg_check_cap_corruption_p4(void); extern void fg_set_full_charged(void); extern void fg_reset_fullcap_in_fullcharge(void); #endif diff --git a/include/linux/power/smb347_charger.h b/include/linux/power/smb347_charger.h index 0c35069..b8a1974 100755 --- a/include/linux/power/smb347_charger.h +++ b/include/linux/power/smb347_charger.h @@ -24,6 +24,9 @@ struct smb_charger_callbacks { void (*set_charging_current) (int); int (*get_charging_current) (void); int (*get_charger_is_full) (void); + int (*get_aicl_current)(void); + int (*get_input_current)(void); + void (*set_aicl_state)(int); }; struct smb_charger_data { diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 7a1653e..566002b 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -176,6 +176,7 @@ enum online_sub_type { ONLINE_SUB_TYPE_DESK, ONLINE_SUB_TYPE_SMART_NOTG, ONLINE_SUB_TYPE_SMART_OTG, + ONLINE_SUB_TYPE_KBD, }; enum online_power_type { -- cgit v1.1