diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-25 08:07:52 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-06-25 08:07:52 -0700 |
| commit | 31f128dccca7a77edf78403d3c368576aa1d9161 (patch) | |
| tree | 42ae44bad0d427b9b462507c438e21de96f293cb /drivers/accessory/sec_keyboard.h | |
| parent | 5dabd15e113634708030215b0494ce473a506d85 (diff) | |
| parent | cb93f68cb9ab19d9647962568b4c895548a869e8 (diff) | |
| download | kernel_samsung_smdk4412-31f128dccca7a77edf78403d3c368576aa1d9161.zip kernel_samsung_smdk4412-31f128dccca7a77edf78403d3c368576aa1d9161.tar.gz kernel_samsung_smdk4412-31f128dccca7a77edf78403d3c368576aa1d9161.tar.bz2 | |
Merge "smdk4412: add i925/p4noteltevzw support" into cm-10.1
Diffstat (limited to 'drivers/accessory/sec_keyboard.h')
| -rw-r--r-- | drivers/accessory/sec_keyboard.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/accessory/sec_keyboard.h b/drivers/accessory/sec_keyboard.h index f5ccf5a..e54ff30 100644 --- a/drivers/accessory/sec_keyboard.h +++ b/drivers/accessory/sec_keyboard.h @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/30pin_con.h> #include <linux/serio.h> +#include <linux/power_supply.h> #define KEYBOARD_SIZE 128 #define US_KEYBOARD 0xeb @@ -51,6 +52,7 @@ struct sec_keyboard_drvdata { struct device *keyboard_dev; struct delayed_work remap_dwork; struct delayed_work power_dwork; + struct delayed_work ack_dwork; struct sec_keyboard_callbacks callbacks; struct serio *serio; struct serio_driver serio_driver; @@ -59,16 +61,19 @@ struct sec_keyboard_drvdata { #endif void (*acc_power)(u8 token, bool active); void (*check_uart_path)(bool en); + int (*noti_univ_kbd_dock)(unsigned int code); bool led_on; bool dockconnected; bool pre_connected; bool pressed[KEYBOARD_SIZE]; bool pre_uart_path; bool tx_ready; + bool univ_kbd_dock; int acc_int_gpio; unsigned int remap_key; unsigned int kl; unsigned int pre_kl; + unsigned int ack_code; unsigned short keycode[KEYBOARD_SIZE]; unsigned long connected_time; unsigned long disconnected_time; |