diff options
Diffstat (limited to 'arch/arm/mach-exynos/p4-input.c')
| -rw-r--r-- | arch/arm/mach-exynos/p4-input.c | 648 |
1 files changed, 552 insertions, 96 deletions
diff --git a/arch/arm/mach-exynos/p4-input.c b/arch/arm/mach-exynos/p4-input.c index 1420f41..e4d43c0 100644 --- a/arch/arm/mach-exynos/p4-input.c +++ b/arch/arm/mach-exynos/p4-input.c @@ -16,80 +16,6 @@ #include <plat/gpio-cfg.h> #include <plat/iic.h> -#if defined(CONFIG_RMI4_I2C) -#include <linux/rmi.h> -static int synaptics_tsp_pre_suspend(const void *pm_data) -{ - if (NULL == pm_data) - return -1; - printk(KERN_DEBUG "[TSP] %s\n", __func__); - - s3c_gpio_cfgpin(GPIO_TSP_SDA_18V, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_SDA_18V, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_SDA_18V, 0); - s3c_gpio_cfgpin(GPIO_TSP_SCL_18V, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_SCL_18V, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_SCL_18V, 0); - - s3c_gpio_cfgpin(GPIO_TSP_INT, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_INT, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_INT, 0); - s3c_gpio_cfgpin(GPIO_TSP_RST, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_RST, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_RST, 0); - s3c_gpio_cfgpin(GPIO_TSP_LDO_ON, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_LDO_ON, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_LDO_ON, 0); - - return 0; -} - -static int synaptics_tsp_post_resume(const void *pm_data) -{ - if (NULL == pm_data) - return -1; - printk(KERN_DEBUG "[TSP] %s\n", __func__); - - s3c_gpio_cfgpin(GPIO_TSP_SDA_18V, S3C_GPIO_SFN(0x3)); - s3c_gpio_setpull(GPIO_TSP_SDA_18V, S3C_GPIO_PULL_UP); - s3c_gpio_cfgpin(GPIO_TSP_SCL_18V, S3C_GPIO_SFN(0x3)); - s3c_gpio_setpull(GPIO_TSP_SCL_18V, S3C_GPIO_PULL_UP); - - s3c_gpio_cfgpin(GPIO_TSP_LDO_ON, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_LDO_ON, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_LDO_ON, 1); - s3c_gpio_cfgpin(GPIO_TSP_RST, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_RST, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_RST, 1); - s3c_gpio_setpull(GPIO_TSP_INT, S3C_GPIO_PULL_NONE); - s3c_gpio_cfgpin(GPIO_TSP_INT, S3C_GPIO_SFN(0xf)); - - return 0; -} - -static void synaptics_tsp_reset(void) -{ - printk(KERN_DEBUG "[TSP] %s\n", __func__); - s3c_gpio_cfgpin(GPIO_TSP_RST, S3C_GPIO_OUTPUT); - s3c_gpio_setpull(GPIO_TSP_RST, S3C_GPIO_PULL_NONE); - gpio_set_value(GPIO_TSP_RST, 0); - msleep(100); - gpio_set_value(GPIO_TSP_RST, 1); -} - -static struct rmi_device_platform_data synaptics_pdata = { - .driver_name = "rmi-generic", - .sensor_name = "s7301", - .attn_gpio = GPIO_TSP_INT, - .attn_polarity = RMI_ATTN_ACTIVE_LOW, - .axis_align = { }, - .pm_data = NULL, - .pre_suspend = synaptics_tsp_pre_suspend, - .post_resume = synaptics_tsp_post_resume, - .hw_reset = synaptics_tsp_reset, -}; -#endif /* CONFIG_RMI4_I2C */ - #if defined(CONFIG_TOUCHSCREEN_SYNAPTICS_S7301) #include <linux/synaptics_s7301.h> static bool have_tsp_ldo; @@ -171,29 +97,517 @@ static struct synaptics_platform_data synaptics_ts_pdata = { .hw_reset = synaptics_ts_reset, .register_cb = synaptics_ts_register_callback, }; -#endif /* CONFIG_TOUCHSCREEN_SYNAPTICS_S7301 */ -static struct i2c_board_info i2c_devs3[] __initdata = { +static struct i2c_board_info i2c_synaptics[] __initdata = { { -#if defined(CONFIG_RMI4_I2C) - I2C_BOARD_INFO(SYNAPTICS_RMI_NAME, - SYNAPTICS_RMI_ADDR), - .platform_data = &synaptics_pdata, -#endif /* CONFIG_RMI4_I2C */ -#if defined(CONFIG_TOUCHSCREEN_SYNAPTICS_S7301) I2C_BOARD_INFO(SYNAPTICS_TS_NAME, SYNAPTICS_TS_ADDR), .platform_data = &synaptics_ts_pdata, + }, +}; #endif /* CONFIG_TOUCHSCREEN_SYNAPTICS_S7301 */ + +#if defined(CONFIG_TOUCHSCREEN_ATMEL_MXT1664S) +#include <linux/i2c/mxt1664s.h> +static struct mxt_callbacks *mxt_callbacks; +static u32 hw_rev; + +/* Caution: Note10(p4note) has various H/W revision and each revision + * has different TSP tunning data. + * So If you add or change the tunning data, please refer the below + * simple description. + * + * H/W revision Project + * ~ 0.6 3G note10(N8010) final revision is 0.6 + * 0.7 ~ 0.8 Reserved + * 0.9 LTE model such as N8020 + */ + +static u8 inform_data_rev6[] = {0, + 7, 0, 48, 255, + 7, 1, 11, 255, + 47, 1, 35, 40, + 55, 0, 1, 0, + 55, 1, 25, 11, + 55, 2, 7, 3, + 56, 36, 0, 3, + 62, 1, 0, 1, + 62, 10, 5, 21, + 62, 12, 5, 21, + 62, 19, 130, 62, + 62, 20, 12, 20, +}; + +static u8 inform_data_rev5[] = {0, + 7, 0, 48, 255, + 7, 1, 11, 255, + 46, 2, 10, 24, + 46, 3, 16, 24, + 47, 1, 35, 40, + 56, 36, 0, 3, + 62, 1, 0, 1, + 62, 9, 16, 20, + 62, 11, 16, 20, + 62, 13, 16, 20, + 62, 13, 0, 21, + 62, 19, 128, 112, + 62, 20, 20, 30, +}; + +/* Added for the LTE model */ +static u8 inform_data_rev9[] = {0, + 7, 1, 11, 255, + 46, 3, 16, 24, + 47, 1, 35, 45, + 47, 9, 16, 24, + 55, 0, 1, 0, + 55, 1, 25, 11, + 55, 2, 7, 3, + 56, 3, 45, 40, + 56, 36, 0, 3, + 62, 3, 0, 23, + 62, 7, 90, 18, + 62, 8, 1, 8, + 62, 10, 0, 8, + 62, 12, 0, 8, + 62, 13, 1, 0, + 62, 19, 136, 100, + 62, 21, 35, 45, + 62, 25, 16, 24, + 62, 26, 16, 24, +}; + +static u8 inform_data[] = {0, + 7, 0, 48, 255, + 7, 1, 11, 255, + 8, 0, 160, 90, + 46, 3, 16, 24, + 47, 9, 16, 24, + 55, 1, 25, 11, + 55, 2, 7, 3, + 56, 36, 0, 3, + 62, 1, 0, 1, + 62, 8, 25, 40, + 62, 9, 15, 40, + 62, 10, 22, 35, + 62, 11, 15, 40, + 62, 12, 22, 35, + 62, 13, 15, 40, + 62, 19, 136, 80, + 62, 20, 15, 5, + 62, 21, 40, 45, + 62, 22, 24, 32, + 62, 25, 16, 24, + 62, 26, 16, 24, +}; + +void ts_charger_infom(bool en) +{ + if (mxt_callbacks && mxt_callbacks->inform_charger) + mxt_callbacks->inform_charger(mxt_callbacks, en); +} + +static u8 *ts_register_callback(struct mxt_callbacks *cb) +{ + mxt_callbacks = cb; + + inform_data[0] = sizeof(inform_data); + inform_data_rev5[0] = sizeof(inform_data_rev5); + inform_data_rev6[0] = sizeof(inform_data_rev6); + inform_data_rev9[0] = sizeof(inform_data_rev9); + + if (0x5 == hw_rev) + return inform_data_rev5; + else if (0x6 == hw_rev) + return inform_data_rev6; + else if (0x9 <= hw_rev) + return inform_data_rev9; + else + return inform_data; +} + +static int ts_power_on(void) +{ + int gpio = 0; + + gpio = GPIO_TSP_SDA_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + gpio = GPIO_TSP_SCL_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + gpio = GPIO_TSP_LDO_ON; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + gpio = GPIO_TSP_LDO_ON1; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + msleep(20); + + gpio = GPIO_TSP_LDO_ON2; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + msleep(20); + gpio = GPIO_TSP_RST; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 1); + + /* touch interrupt pin */ + gpio = GPIO_TSP_INT; + s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf)); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + +#if 0 + msleep(MXT_1664S_HW_RESET_TIME); +#endif + + gpio = GPIO_TSP_SDA_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0x3)); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); + + gpio = GPIO_TSP_SCL_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0x3)); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); + + printk(KERN_ERR "mxt_power_on is finished\n"); + + return 0; +} + +static int ts_power_off(void) +{ + int gpio = 0; + + gpio = GPIO_TSP_SDA_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + gpio = GPIO_TSP_SCL_18V; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + /* touch xvdd en pin */ + gpio = GPIO_TSP_LDO_ON2; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + gpio = GPIO_TSP_LDO_ON1; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + gpio = GPIO_TSP_LDO_ON; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + /* touch interrupt pin */ + gpio = GPIO_TSP_INT; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_DOWN); + + /* touch reset pin */ + gpio = GPIO_TSP_RST; + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_set_value(gpio, 0); + + printk(KERN_ERR "mxt_power_off is finished\n"); + + return 0; +} + +static int ts_power_reset(void) +{ + ts_power_off(); + msleep(100); + ts_power_on(); + msleep(300); + return 0; +} + +/* + Configuration for MXT1664-S +*/ +#define MXT1664S_CONFIG_DATE "N80XX_ATM_0703" +#define MXT1664S_MAX_MT_FINGERS 10 +#define MXT1664S_BLEN_BATT 112 +#define MXT1664S_CHRGTIME_BATT 180 +#define MXT1664S_THRESHOLD_BATT 65 +#define P4_NOTE_X_NUM 27 +#define P4_NOTE_Y_NUM 42 + +static u8 t7_config_s[] = { GEN_POWERCONFIG_T7, + 255, 255, 150, 3 +}; + +static u8 t8_config_s[] = { GEN_ACQUISITIONCONFIG_T8, + MXT1664S_CHRGTIME_BATT, 0, 5, 10, 0, 0, 255, 255, 0, 0 +}; + +static u8 t9_config_s[] = { TOUCH_MULTITOUCHSCREEN_T9, + 0x83, 0, 0, P4_NOTE_X_NUM, P4_NOTE_Y_NUM, + 0, MXT1664S_BLEN_BATT, MXT1664S_THRESHOLD_BATT, 1, 1, + 10, 15, 1, 65, MXT1664S_MAX_MT_FINGERS, 20, 30, 20, 255, 15, + 255, 15, 5, 246, 5, 5, 0, 0, 0, 0, + 32, 20, 51, 53, 0, 1 +}; + +static u8 t15_config_s[] = { TOUCH_KEYARRAY_T15, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0 +}; + +static u8 t18_config_s[] = { SPT_COMCONFIG_T18, + 0, 0 +}; + +static u8 t24_config_s[] = { + PROCI_ONETOUCHGESTUREPROCESSOR_T24, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static u8 t25_config_s[] = { + SPT_SELFTEST_T25, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 200 +}; + +static u8 t27_config_s[] = { + PROCI_TWOTOUCHGESTUREPROCESSOR_T27, + 0, 0, 0, 0, 0, 0, 0 +}; + +static u8 t40_config_s[] = { PROCI_GRIPSUPPRESSION_T40, + 0x11, 3, 55, 0, 0 +}; + +static u8 t42_config_s[] = { PROCI_TOUCHSUPPRESSION_T42, + 0, 42, 50, 50, 127, 0, 0, 0, 5, 5 +}; + +static u8 t43_config_s[] = { SPT_DIGITIZER_T43, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0 +}; + +static u8 t46_config_s[] = { SPT_CTECONFIG_T46, + 4, 0, 10, 16, 0, 0, 1, 0, 0, 0, + 15 +}; + +static u8 t47_config_s[] = { PROCI_STYLUS_T47, + 73, 40, 60, 15, 10, 40, 0, 120, 1, 16, + 0, 0, 15 +}; + +static u8 t55_config_s[] = {ADAPTIVE_T55, + 1, 25, 7, 10, 20, 1, 0 +}; + +static u8 t56_config_s[] = {PROCI_SHIELDLESS_T56, + 3, 0, 1, 55, 25, 25, 25, 25, 25, 25, + 24, 24, 24, 23, 23, 23, 22, 22, 22, 21, + 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, + 17, 0, 0, 0, 0, 0, 0, 128, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0 +}; + +static u8 t57_config_s[] = {PROCI_EXTRATOUCHSCREENDATA_T57, + 0xe3, 25, 0 +}; + +static u8 t61_config_s[] = {SPT_TIMER_T61, + 0, 0, 0, 0, 0 +}; + +static u8 t62_config_s[] = {PROCG_NOISESUPPRESSION_T62, + 3, 0, 0, 23, 10, 0, 0, 0, 25, 0, + 5, 0, 5, 0, 2, 0, 5, 5, 10, 130, + 12, 40, 32, 20, 63, 16, 16, 4, 100, 0, + 0, 0, 0, 0, 60, 40, 2, 15, 1, 66, + 10, 20, 30, 20, 15, 5, 5, 0, 0, 0, + 0, 60, 15, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0 +}; + +static u8 end_config_s[] = { RESERVED_T255 }; + +static const u8 *MXT1644S_config[] = { + t7_config_s, + t8_config_s, + t9_config_s, + t15_config_s, + t18_config_s, + t24_config_s, + t25_config_s, + t27_config_s, + t40_config_s, + t42_config_s, + t43_config_s, + t46_config_s, + t47_config_s, + t55_config_s, + t56_config_s, + t57_config_s, + t61_config_s, + t62_config_s, + end_config_s, +}; + +static struct mxt_platform_data mxt1664s_pdata = { + .max_finger_touches = MXT1664S_MAX_MT_FINGERS, + .gpio_read_done = GPIO_TSP_INT, + .min_x = 0, + .max_x = 4095, + .min_y = 0, + .max_y = 4095, + .min_z = 0, + .max_z = 255, + .min_w = 0, + .max_w = 255, + .config = MXT1644S_config, + .power_on = ts_power_on, + .power_off = ts_power_off, + .power_reset = ts_power_reset, + .boot_address = 0x26, + .register_cb = ts_register_callback, + .config_version = MXT1664S_CONFIG_DATE, +}; + +static struct i2c_board_info i2c_mxt1664s[] __initdata = { + { + I2C_BOARD_INFO(MXT_DEV_NAME, 0x4A), + .platform_data = &mxt1664s_pdata, }, }; +#endif + +static void switch_config(u32 rev) +{ + int i = 0; + + /* the number of the array should be added by 1 */ + if (0x5 == rev) { + t8_config_s[1] = 150; + + t9_config_s[9] = 1; + t9_config_s[11] = 0; + t9_config_s[12] = 5; + t9_config_s[16] = 10; + t9_config_s[17] = 20; + t9_config_s[32] = 15; + + t47_config_s[2] = 35; + t47_config_s[4] = 10; + t47_config_s[5] = 2; + t47_config_s[6] = 30; + t47_config_s[10] = 24; + + t55_config_s[1] = 0; + + for (i = 5; i < 32; i++) + t56_config_s[i] += 2; + + t62_config_s[9] = 20; + t62_config_s[10] = 16; + t62_config_s[11] = 0; + t62_config_s[12] = 16; + t62_config_s[13] = 0; + t62_config_s[14] = 16; + t62_config_s[20] = 128; + t62_config_s[21] = 20; + t62_config_s[22] = 10; + t62_config_s[23] = 40; + t62_config_s[24] = 10; + t62_config_s[25] = 64; + t62_config_s[26] = 24; + t62_config_s[27] = 24; + t62_config_s[35] = 64; + t62_config_s[36] = 45; + } else if (0x9 <= rev) { + u8 tmp = 0; + t7_config_s[1] = 48; + t7_config_s[2] = 11; + + t8_config_s[1] = 1; + + t9_config_s[8] = 55; + t9_config_s[27] = 64; + + t40_config_s[4] = 2; + t40_config_s[5] = 2; + + t46_config_s[11] = 11; + + t47_config_s[2] = 35; + + t56_config_s[4] = 45; + tmp = 22; + for (i = 5; i < 21; i++) { + if (1 == i % 4) + tmp--; + t56_config_s[i] = tmp; + } + + for (i = 21; i < 28; i++) + t56_config_s[i] = 17; + + for (i = 28; i < 31; i++) + t56_config_s[i] = 16; + + t56_config_s[39] = 1; + + t62_config_s[1] = 125; + t62_config_s[2] = 1; + t62_config_s[4] = 0; + t62_config_s[8] = 90; + t62_config_s[9] = 1; + t62_config_s[11] = 0; + t62_config_s[13] = 0; + t62_config_s[14] = 1; + t62_config_s[20] = 136; + t62_config_s[22] = 35; + t62_config_s[35] = 80; + t62_config_s[36] = 50; + t62_config_s[38] = 5; + t62_config_s[42] = 30; + t62_config_s[43] = 40; + t62_config_s[44] = 10; + t62_config_s[45] = 0; + t62_config_s[48] = 30; + t62_config_s[49] = 30; + t62_config_s[53] = 20; + } +} void __init p4_tsp_init(u32 system_rev) { - int gpio; + int gpio = 0, irq = 0; + hw_rev = system_rev; printk(KERN_DEBUG "[TSP] %s rev : %u\n", - __func__, system_rev); + __func__, hw_rev); + + printk(KERN_DEBUG "[TSP] TSP IC : %s\n", + (5 <= hw_rev) ? "Atmel" : "Synaptics"); gpio = GPIO_TSP_RST; gpio_request(gpio, "TSP_RST"); @@ -205,26 +619,45 @@ void __init p4_tsp_init(u32 system_rev) gpio_direction_output(gpio, 1); gpio_export(gpio, 0); + if (5 <= hw_rev) { + gpio = GPIO_TSP_LDO_ON1; + gpio_request(gpio, "TSP_LDO_ON1"); + gpio_direction_output(gpio, 1); + gpio_export(gpio, 0); + + gpio = GPIO_TSP_LDO_ON2; + gpio_request(gpio, "TSP_LDO_ON2"); + gpio_direction_output(gpio, 1); + gpio_export(gpio, 0); + + switch_config(hw_rev); + } else if (1 <= hw_rev) + have_tsp_ldo = true; + gpio = GPIO_TSP_INT; gpio_request(gpio, "TSP_INT"); - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf)); s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); s5p_register_gpio_interrupt(gpio); - i2c_devs3[0].irq = gpio_to_irq(gpio); - if (1 <= system_rev) -#if defined(CONFIG_RMI4_I2C) - synaptics_pdata.pm_data = - (char *)synaptics_pdata.sensor_name; -#else - have_tsp_ldo = true; -#endif + irq = gpio_to_irq(gpio); #ifdef CONFIG_S3C_DEV_I2C3 s3c_i2c3_set_platdata(NULL); - i2c_register_board_info(3, i2c_devs3, - ARRAY_SIZE(i2c_devs3)); + +#if defined(CONFIG_TOUCHSCREEN_ATMEL_MXT1664S) && \ + defined(CONFIG_TOUCHSCREEN_SYNAPTICS_S7301) + if (5 <= system_rev) { + i2c_mxt1664s[0].irq = irq; + i2c_register_board_info(3, i2c_mxt1664s, + ARRAY_SIZE(i2c_mxt1664s)); + } else { + i2c_synaptics[0].irq = irq; + i2c_register_board_info(3, i2c_synaptics, + ARRAY_SIZE(i2c_synaptics)); + } #endif +#endif /* CONFIG_S3C_DEV_I2C3 */ + } #if defined(CONFIG_EPEN_WACOM_G5SP) @@ -243,6 +676,12 @@ static struct wacom_g5_platform_data wacom_platform_data = { .y_invert = 0, .xy_switch = 0, .gpio_pendct = GPIO_PEN_PDCT_18V, +#ifdef WACOM_PEN_DETECT + .gpio_pen_insert = GPIO_S_PEN_IRQ, +#endif +#ifdef WACOM_HAVE_FWE_PIN + .gpio_fwe = GPIO_PEN_FWE0, +#endif .init_platform_hw = wacom_init_hw, .suspend_platform_hw = wacom_suspend_hw, .resume_platform_hw = wacom_resume_hw, @@ -274,7 +713,7 @@ static int wacom_init_hw(void) } s3c_gpio_cfgpin(GPIO_PEN_LDO_EN, S3C_GPIO_SFN(0x1)); s3c_gpio_setpull(GPIO_PEN_LDO_EN, S3C_GPIO_PULL_NONE); - gpio_direction_output(GPIO_PEN_LDO_EN, 1); + gpio_direction_output(GPIO_PEN_LDO_EN, 0); ret = gpio_request(GPIO_PEN_PDCT_18V, "PEN_PDCT"); if (ret) { @@ -293,6 +732,23 @@ static int wacom_init_hw(void) s3c_gpio_setpull(GPIO_PEN_IRQ_18V, S3C_GPIO_PULL_DOWN); s5p_register_gpio_interrupt(GPIO_PEN_IRQ_18V); i2c_devs6[0].irq = gpio_to_irq(GPIO_PEN_IRQ_18V); + +#ifdef WACOM_PEN_DETECT + s3c_gpio_cfgpin(GPIO_S_PEN_IRQ, S3C_GPIO_SFN(0xf)); + s3c_gpio_setpull(GPIO_S_PEN_IRQ, S3C_GPIO_PULL_UP); +#endif + +#ifdef WACOM_HAVE_FWE_PIN + ret = gpio_request(GPIO_PEN_FWE0, "GPIO_PEN_FWE0"); + if (ret) { + printk(KERN_ERR "[E-PEN] faile to request gpio(GPIO_PEN_FWE0)\n"); + return ret; + } + s3c_gpio_cfgpin(GPIO_PEN_FWE0, S3C_GPIO_SFN(0x1)); + s3c_gpio_setpull(GPIO_PEN_FWE0, S3C_GPIO_PULL_NONE); + gpio_direction_output(GPIO_PEN_FWE0, 0); +#endif + return 0; } |