diff options
Diffstat (limited to 'drivers/input/keyboard/cypress/cypress-touchkey.c')
| -rw-r--r-- | drivers/input/keyboard/cypress/cypress-touchkey.c | 309 |
1 files changed, 143 insertions, 166 deletions
diff --git a/drivers/input/keyboard/cypress/cypress-touchkey.c b/drivers/input/keyboard/cypress/cypress-touchkey.c index f29fbb0..6ccd693 100644 --- a/drivers/input/keyboard/cypress/cypress-touchkey.c +++ b/drivers/input/keyboard/cypress/cypress-touchkey.c @@ -66,7 +66,7 @@ static int touchkey_keycode[] = { 0, KEY_MENU, KEY_ENTER, KEY_BACK, KEY_END, #elif defined(TK_USE_4KEY_TYPE_NA) - KEY_SEARCH, KEY_BACK, KEY_HOMEPAGE, KEY_MENU, + KEY_SEARCH, KEY_BACK, KEY_HOME, KEY_MENU, #elif defined(TK_USE_2KEY_TYPE_M0) KEY_BACK, KEY_MENU, @@ -161,10 +161,10 @@ static ssize_t brightness_control(struct device *dev, int data; if (sscanf(buf, "%d\n", &data) == 1) { - printk(KERN_ERR "[TouchKey] touch_led_brightness: %d\n", data); + pr_err("[TouchKey] touch_led_brightness: %d\n", data); change_touch_key_led_voltage(data); } else { - printk(KERN_ERR "[TouchKey] touch_led_brightness Error\n"); + pr_err("[TouchKey] touch_led_brightness Error\n"); } return size; @@ -191,7 +191,7 @@ static int i2c_touchkey_read(struct i2c_client *client, if ((client == NULL) || !(touchkey_enable == 1) || !touchkey_probe) { - printk(KERN_ERR "[TouchKey] touchkey is not enabled. %d\n", + pr_err("[TouchKey] touchkey is not enabled. %d\n", __LINE__); return -ENODEV; } @@ -210,7 +210,7 @@ static int i2c_touchkey_read(struct i2c_client *client, if (err >= 0) return 0; - printk(KERN_ERR "[TouchKey] %s %d i2c transfer error\n", + pr_err("[TouchKey] %s %d i2c transfer error\n", __func__, __LINE__); mdelay(10); } @@ -229,7 +229,7 @@ static int i2c_touchkey_write(struct i2c_client *client, if ((client == NULL) || !(touchkey_enable == 1) || !touchkey_probe) { - printk(KERN_ERR "[TouchKey] touchkey is not enabled. %d\n", + pr_err("[TouchKey] touchkey is not enabled. %d\n", __LINE__); return -ENODEV; } @@ -249,7 +249,7 @@ static int i2c_touchkey_write(struct i2c_client *client, if (err >= 0) return 0; - printk(KERN_DEBUG "[TouchKey] %s %d i2c transfer error\n", + pr_debug("[TouchKey] %s %d i2c transfer error\n", __func__, __LINE__); mdelay(10); } @@ -272,11 +272,10 @@ static int touchkey_autocalibration(struct touchkey_i2c *tkey_i2c) while (retry < 3) { ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 4); if (ret < 0) { - printk(KERN_ERR "[TouchKey]i2c read fail.\n"); + pr_err("[TouchKey]i2c read fail.\n"); return ret; } - printk(KERN_DEBUG - "[TouchKey] data[0]=%x data[1]=%x data[2]=%x data[3]=%x\n", + pr_debug("[TouchKey] data[0]=%x data[1]=%x data[2]=%x data[3]=%x\n", data[0], data[1], data[2], data[3]); /* Send autocal Command */ @@ -291,24 +290,23 @@ static int touchkey_autocalibration(struct touchkey_i2c *tkey_i2c) ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 6); if ((data[5] & TK_BIT_AUTOCAL)) { - printk(KERN_DEBUG "[Touchkey] autocal Enabled\n"); + pr_debug("[Touchkey] autocal Enabled\n"); break; } else - printk(KERN_DEBUG - "[Touchkey] autocal disabled, retry %d\n", + pr_debug("[Touchkey] autocal disabled, retry %d\n", retry); retry = retry + 1; } if (retry == 3) - printk(KERN_DEBUG "[Touchkey] autocal failed\n"); + pr_debug("[Touchkey] autocal failed\n"); return count; } #endif -#ifdef CONFIG_TARGET_LOCALE_NAATT +#if 0 /* CONFIG_TARGET_LOCALE_NAATT */ static ssize_t set_touchkey_autocal_testmode(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) @@ -319,7 +317,7 @@ static ssize_t set_touchkey_autocal_testmode(struct device *dev, int on_off; if (sscanf(buf, "%d\n", &on_off) == 1) { - printk(KERN_ERR "[TouchKey] Test Mode : %d\n", on_off); + pr_err("[TouchKey] Test Mode : %d\n", on_off); if (on_off == 1) { set_data = 0x40; @@ -335,7 +333,7 @@ static ssize_t set_touchkey_autocal_testmode(struct device *dev, #endif } } else { - printk(KERN_ERR "[TouchKey] touch_led_brightness Error\n"); + pr_err("[TouchKey] touch_led_brightness Error\n"); } return count; @@ -350,24 +348,24 @@ static ssize_t touchkey_raw_data0_show(struct device *dev, u8 data[26] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 26); #if defined(CONFIG_TARGET_LOCALE_NA) - printk(KERN_DEBUG "called %s data[18] =%d,data[19] = %d\n", __func__, + pr_debug("called %s data[18] =%d,data[19] = %d\n", __func__, data[18], data[19]); raw_data0 = ((0x00FF & data[18]) << 8) | data[19]; #elif defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_C1)\ || defined(CONFIG_MACH_M3)\ || defined(CONFIG_MACH_T0) - printk(KERN_DEBUG "called %s data[16] =%d,data[17] = %d\n", __func__, + pr_debug("called %s data[16] =%d,data[17] = %d\n", __func__, data[16], data[17]); raw_data0 = ((0x00FF & data[16]) << 8) | data[17]; /* menu*/ #elif defined(CONFIG_MACH_Q1_BD) - printk(KERN_DEBUG "called %s data[16] =%d,data[17] = %d\n", __func__, + pr_debug("called %s data[16] =%d,data[17] = %d\n", __func__, data[16], data[17]); raw_data0 = ((0x00FF & data[14]) << 8) | data[15]; #else - printk(KERN_DEBUG "called %s data[18] =%d,data[19] = %d\n", __func__, + pr_debug("called %s data[18] =%d,data[19] = %d\n", __func__, data[10], data[11]); raw_data0 = ((0x00FF & data[10]) << 8) | data[11]; #endif @@ -381,24 +379,24 @@ static ssize_t touchkey_raw_data1_show(struct device *dev, u8 data[26] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 26); #if defined(CONFIG_TARGET_LOCALE_NA) - printk(KERN_DEBUG "called %s data[20] =%d,data[21] = %d\n", __func__, + pr_debug("called %s data[20] =%d,data[21] = %d\n", __func__, data[20], data[21]); raw_data1 = ((0x00FF & data[20]) << 8) | data[21]; #elif defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_C1)\ || defined(CONFIG_MACH_M3)\ || defined(CONFIG_MACH_T0) - printk(KERN_DEBUG "called %s data[14] =%d,data[15] = %d\n", __func__, + pr_debug("called %s data[14] =%d,data[15] = %d\n", __func__, data[14], data[15]); raw_data1 = ((0x00FF & data[14]) << 8) | data[15]; /*back*/ #elif defined(CONFIG_MACH_Q1_BD) - printk(KERN_DEBUG "called %s data[14] =%d,data[15] = %d\n", __func__, + pr_debug("called %s data[14] =%d,data[15] = %d\n", __func__, data[14], data[15]); raw_data1 = ((0x00FF & data[16]) << 8) | data[17]; #else - printk(KERN_DEBUG "called %s data[20] =%d,data[21] = %d\n", __func__, + pr_debug("called %s data[20] =%d,data[21] = %d\n", __func__, data[12], data[13]); raw_data1 = ((0x00FF & data[12]) << 8) | data[13]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -412,14 +410,14 @@ static ssize_t touchkey_raw_data2_show(struct device *dev, u8 data[26] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 26); #if defined(CONFIG_TARGET_LOCALE_NA) - printk(KERN_DEBUG "called %s data[22] =%d,data[23] = %d\n", __func__, + pr_debug("called %s data[22] =%d,data[23] = %d\n", __func__, data[22], data[23]); raw_data2 = ((0x00FF & data[22]) << 8) | data[23]; #else - printk(KERN_DEBUG "called %s data[22] =%d,data[23] = %d\n", __func__, + pr_debug("called %s data[22] =%d,data[23] = %d\n", __func__, data[14], data[15]); raw_data2 = ((0x00FF & data[14]) << 8) | data[15]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -433,14 +431,14 @@ static ssize_t touchkey_raw_data3_show(struct device *dev, u8 data[26] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 26); #if defined(CONFIG_TARGET_LOCALE_NA) - printk(KERN_DEBUG "called %s data[24] =%d,data[25] = %d\n", __func__, + pr_debug("called %s data[24] =%d,data[25] = %d\n", __func__, data[24], data[25]); raw_data3 = ((0x00FF & data[24]) << 8) | data[25]; #else - printk(KERN_DEBUG "called %s data[24] =%d,data[25] = %d\n", __func__, + pr_debug("called %s data[24] =%d,data[25] = %d\n", __func__, data[16], data[17]); raw_data3 = ((0x00FF & data[16]) << 8) | data[17]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -458,9 +456,9 @@ static ssize_t touchkey_idac0_show(struct device *dev, return 0; #endif - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); - printk(KERN_DEBUG "called %s data[6] =%d\n", __func__, data[6]); + pr_debug("called %s data[6] =%d\n", __func__, data[6]); idac0 = data[6]; return sprintf(buf, "%d\n", idac0); } @@ -476,9 +474,9 @@ static ssize_t touchkey_idac1_show(struct device *dev, return 0; #endif - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); - printk(KERN_DEBUG "called %s data[7] = %d\n", __func__, data[7]); + pr_debug("called %s data[7] = %d\n", __func__, data[7]); idac1 = data[7]; return sprintf(buf, "%d\n", idac1); } @@ -494,9 +492,9 @@ static ssize_t touchkey_idac2_show(struct device *dev, return 0; #endif - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); - printk(KERN_DEBUG "called %s data[8] =%d\n", __func__, data[8]); + pr_debug("called %s data[8] =%d\n", __func__, data[8]); idac2 = data[8]; return sprintf(buf, "%d\n", idac2); } @@ -512,9 +510,9 @@ static ssize_t touchkey_idac3_show(struct device *dev, return 0; #endif - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); - printk(KERN_DEBUG "called %s data[9] = %d\n", __func__, data[9]); + pr_debug("called %s data[9] = %d\n", __func__, data[9]); idac3 = data[9]; return sprintf(buf, "%d\n", idac3); } @@ -526,9 +524,9 @@ static ssize_t touchkey_threshold_show(struct device *dev, u8 data[10]; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("called %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); - printk(KERN_DEBUG "called %s data[4] = %d\n", __func__, data[4]); + pr_debug("called %s data[4] = %d\n", __func__, data[4]); touchkey_threshold = data[4]; return sprintf(buf, "%d\n", touchkey_threshold); } @@ -546,13 +544,12 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); if (ret < 0) { - printk(KERN_DEBUG - "[TouchKey] i2c read fail. do not excute firm update.\n"); + pr_debug("[TouchKey] i2c read fail. do not excute firm update.\n"); data[1] = 0; data[2] = 0; } - printk(KERN_ERR "%s F/W version: 0x%x, Module version:0x%x\n", __func__, + pr_err("%s F/W version: 0x%x, Module version:0x%x\n", __func__, data[1], data[2]); tkey_i2c->firmware_ver = data[1]; @@ -566,39 +563,34 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) if ((tkey_i2c->firmware_ver < TK_FIRMWARE_VER) && (tkey_i2c->module_ver == TK_MODULE_VER)) { #endif - printk(KERN_DEBUG "[TouchKey] firmware auto update excute\n"); + pr_debug("[TouchKey] firmware auto update excute\n"); tkey_i2c->update_status = TK_UPDATE_DOWN; while (retry--) { if (ISSP_main(tkey_i2c) == 0) { - printk(KERN_DEBUG - "[TouchKey]firmware update succeeded\n"); + pr_debug("[TouchKey]firmware update succeeded\n"); tkey_i2c->update_status = TK_UPDATE_PASS; msleep(50); break; } msleep(50); - printk(KERN_DEBUG - "[TouchKey] firmware update failed. retry\n"); + pr_debug("[TouchKey] firmware update failed. retry\n"); } if (retry <= 0) { tkey_i2c->pdata->power_on(0); tkey_i2c->update_status = TK_UPDATE_FAIL; - printk(KERN_DEBUG - "[TouchKey] firmware update failed.\n"); + pr_debug("[TouchKey] firmware update failed.\n"); } ret = touchkey_i2c_check(tkey_i2c); if (ret < 0) { - printk(KERN_DEBUG - "[TouchKey] i2c read fail.\n"); + pr_debug("[TouchKey] i2c read fail.\n"); return TK_UPDATE_FAIL; } #if defined(CONFIG_TARGET_LOCALE_KOR) ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); if (ret < 0) { - printk(KERN_DEBUG - "[TouchKey] i2c read fail. do not excute firm update.\n"); + pr_debug("[TouchKey] i2c read fail. do not excute firm update.\n"); } tkey_i2c->firmware_ver = data[1]; tkey_i2c->module_ver = data[2]; @@ -606,13 +598,10 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) printk(KERN_DEBUG "[TouchKey] firm ver = %d, module ver = %d\n", tkey_i2c->firmware_ver, tkey_i2c->module_ver); } else { - printk(KERN_DEBUG - "[TouchKey] firmware auto update do not excute\n"); - printk(KERN_DEBUG - "[TouchKey] firmware_ver(banary=%d, current=%d)\n", + pr_debug("[TouchKey] firmware auto update do not excute\n"); + pr_debug("[TouchKey] firmware_ver(banary=%d, current=%d)\n", TK_FIRMWARE_VER, tkey_i2c->firmware_ver); - printk(KERN_DEBUG - "[TouchKey] module_ver(banary=%d, current=%d)\n", + pr_debug("[TouchKey] module_ver(banary=%d, current=%d)\n", TK_MODULE_VER, tkey_i2c->module_ver); } enable_irq(tkey_i2c->irq); @@ -627,12 +616,11 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); if (ret < 0) { - printk(KERN_DEBUG - "[TouchKey] i2c read fail. do not excute firm update.\n"); + pr_debug("[TouchKey] i2c read fail. do not excute firm update.\n"); return ret; } - printk(KERN_ERR "%s F/W version: 0x%x, Module version:0x%x\n", __func__, + pr_err("%s F/W version: 0x%x, Module version:0x%x\n", __func__, data[1], data[2]); retry = 3; @@ -643,12 +631,11 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) tkey_i2c->update_status = TK_UPDATE_DOWN; while (retry--) { if (ISSP_main(tkey_i2c) == 0) { - printk(KERN_ERR - "[TOUCHKEY]Touchkey_update succeeded\n"); + pr_err("[TOUCHKEY]Touchkey_update succeeded\n"); tkey_i2c->update_status = TK_UPDATE_PASS; break; } - printk(KERN_ERR "touchkey_update failed...retry...\n"); + pr_err("touchkey_update failed...retry...\n"); } if (retry <= 0) { tkey_i2c->pdata->power_on(0); @@ -657,11 +644,9 @@ static int touchkey_firmware_update(struct touchkey_i2c *tkey_i2c) } } else { if (tkey_i2c->firmware_ver >= 0x0A) { - printk(KERN_ERR - "[TouchKey] Not F/W update. Cypess touch-key F/W version is latest\n"); + pr_err("[TouchKey] Not F/W update. Cypess touch-key F/W version is latest\n"); } else { - printk(KERN_ERR - "[TouchKey] Not F/W update. Cypess touch-key version(module or F/W) is not valid\n"); + pr_err("[TouchKey] Not F/W update. Cypess touch-key version(module or F/W) is not valid\n"); } } return ret; @@ -687,8 +672,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) if (!ret) break; else { - printk(KERN_DEBUG - "[TouchKey] i2c read failed, ret:%d, retry: %d\n", + pr_debug("[TouchKey] i2c read failed, ret:%d, retry: %d\n", ret, retry); continue; } @@ -702,7 +686,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) pressed = !(data[0] & TK_BIT_PRESS_EV); if (keycode_type <= 0 || keycode_type >= touchkey_count) { - printk(KERN_DEBUG "[Touchkey] keycode_type err\n"); + pr_debug("[Touchkey] keycode_type err\n"); return IRQ_HANDLED; } @@ -735,13 +719,13 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) } if (get_tsp_status() && pressed) - printk(KERN_DEBUG "[TouchKey] touchkey pressed but don't send event because touch is pressed.\n"); + pr_debug("[TouchKey] touchkey pressed but don't send event because touch is pressed.\n"); else { input_report_key(tkey_i2c->input_dev, touchkey_keycode[keycode_type], pressed); input_sync(tkey_i2c->input_dev); #if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP) - printk(KERN_DEBUG "[TouchKey] keycode:%d pressed:%d\n", + pr_debug("[TouchKey] keycode:%d pressed:%d\n", touchkey_keycode[keycode_type], pressed); #else pr_debug("[TouchKey] pressed:%d\n", @@ -750,10 +734,10 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) #if defined(CONFIG_TARGET_LOCALE_KOR) if (g_debug_tkey == true) { - printk(KERN_DEBUG "[TouchKey] keycode[%d]=%d pressed:%d\n", + pr_debug("[TouchKey] keycode[%d]=%d pressed:%d\n", keycode_type, touchkey_keycode[keycode_type], pressed); } else { - printk(KERN_DEBUG "[TouchKey] pressed:%d\n", pressed); + pr_debug("[TouchKey] pressed:%d\n", pressed); } #endif } @@ -772,7 +756,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) #if 0 if (gpio_get_value(_3_GPIO_TOUCH_INT)) { - printk(KERN_DEBUG "[TouchKey] Unknown state.\n", __func__); + pr_debug("[TouchKey] Unknown state.\n", __func__); return IRQ_HANDLED; } #endif @@ -796,8 +780,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) if (!ret) break; else { - printk(KERN_DEBUG - "[TouchKey] i2c read failed, ret:%d, retry: %d\n", + pr_debug("[TouchKey] i2c read failed, ret:%d, retry: %d\n", ret, retry); continue; } @@ -838,7 +821,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) pressed = !(data[0] & TK_BIT_PRESS_EV); if (keycode_type <= 0 || keycode_type >= touchkey_count) { - printk(KERN_DEBUG "[Touchkey] keycode_type err\n"); + pr_debug("[Touchkey] keycode_type err\n"); return IRQ_HANDLED; } @@ -847,7 +830,7 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) } if (get_tsp_status() && pressed) - printk(KERN_DEBUG "[TouchKey] touchkey pressed" + pr_debug("[TouchKey] touchkey pressed" " but don't send event because touch is pressed.\n"); else { input_report_key(touchkey_driver->input_dev, @@ -861,14 +844,14 @@ static irqreturn_t touchkey_interrupt(int irq, void *dev_id) printk(KERN_DEBUG "search key sensitivity = %d\n", search_sensitivity); if (keycode_type == 2) - printk(KERN_DEBUG "back key sensitivity = %d\n", + pr_debug("back key sensitivity = %d\n", back_sensitivity); #ifdef CONFIG_TARGET_LOCALE_NA if (keycode_type == 3) - printk(KERN_DEBUG "home key sensitivity = %d\n", + pr_debug("home key sensitivity = %d\n", home_sensitivity); if (keycode_type == 4) - printk(KERN_DEBUG "menu key sensitivity = %d\n", + pr_debug("menu key sensitivity = %d\n", menu_sensitivity); #endif @@ -888,7 +871,7 @@ static int sec_touchkey_early_suspend(struct early_suspend *h) disable_irq(tkey_i2c->irq); ret = cancel_work_sync(&tkey_i2c->update_work); if (ret) { - printk(KERN_DEBUG "[Touchkey] enable_irq ret=%d\n", ret); + pr_debug("[Touchkey] enable_irq ret=%d\n", ret); enable_irq(tkey_i2c->irq); } @@ -901,9 +884,9 @@ static int sec_touchkey_early_suspend(struct early_suspend *h) touchkey_enable = 0; set_touchkey_debug('S'); - printk(KERN_DEBUG "[TouchKey] sec_touchkey_early_suspend\n"); + pr_debug("[TouchKey] sec_touchkey_early_suspend\n"); if (touchkey_enable < 0) { - printk(KERN_DEBUG "[TouchKey] ---%s---touchkey_enable: %d\n", + pr_debug("[TouchKey] ---%s---touchkey_enable: %d\n", __func__, touchkey_enable); return 0; } @@ -926,13 +909,13 @@ static int sec_touchkey_late_resume(struct early_suspend *h) #endif set_touchkey_debug('R'); - printk(KERN_DEBUG "[TouchKey] sec_touchkey_late_resume\n"); + pr_debug("[TouchKey] sec_touchkey_late_resume\n"); /* enable ldo11 */ tkey_i2c->pdata->power_on(1); if (touchkey_enable < 0) { - printk(KERN_DEBUG "[TouchKey] ---%s---touchkey_enable: %d\n", + pr_debug("[TouchKey] ---%s---touchkey_enable: %d\n", __func__, touchkey_enable); return 0; } @@ -949,7 +932,7 @@ static int sec_touchkey_late_resume(struct early_suspend *h) touchled_cmd_reversed = 0; i2c_touchkey_write(tkey_i2c->client, (u8 *) &touchkey_led_status, 1); - printk(KERN_DEBUG "[Touchkey] LED returned on\n"); + pr_debug("[Touchkey] LED returned on\n"); } #ifdef TEST_JIG_MODE i2c_touchkey_write(tkey_i2c->client, &get_touch, 1); @@ -968,7 +951,7 @@ static int touchkey_i2c_check(struct touchkey_i2c *tkey_i2c) ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); if (ret < 0) { - printk(KERN_ERR "[TouchKey] module version read fail\n"); + pr_err("[TouchKey] module version read fail\n"); return ret; } @@ -1000,8 +983,8 @@ static ssize_t touch_version_read(struct device *dev, count = sprintf(buf, "0x%x\n", data[1]); - printk(KERN_DEBUG "[TouchKey] touch_version_read 0x%x\n", data[1]); - printk(KERN_DEBUG "[TouchKey] module_version_read 0x%x\n", data[2]); + pr_debug("[TouchKey] touch_version_read 0x%x\n", data[1]); + pr_debug("[TouchKey] module_version_read 0x%x\n", data[2]); return count; } @@ -1023,16 +1006,15 @@ void touchkey_update_func(struct work_struct *work) #if defined(CONFIG_TARGET_LOCALE_NAATT) char data[3]; i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); - printk(KERN_DEBUG "[%s] F/W version: 0x%x, Module version:0x%x\n", + pr_debug("[Touchkey] %s: F/W version: 0x%x, Module version:0x%x\n", __func__, data[1], data[2]); #endif tkey_i2c->update_status = TK_UPDATE_DOWN; - printk(KERN_DEBUG "[TouchKey] %s start\n", __func__); + pr_debug("[Touchkey] %s: start\n", __func__); touchkey_enable = 0; while (retry--) { if (ISSP_main(tkey_i2c) == 0) { - printk(KERN_DEBUG - "[TouchKey] touchkey_update succeeded\n"); + pr_debug("[TouchKey] touchkey_update succeeded\n"); msleep(50); touchkey_enable = 1; #if defined(TK_HAS_AUTOCAL) @@ -1111,13 +1093,13 @@ static ssize_t touchkey_led_control(struct device *dev, #endif ret = sscanf(buf, "%d", &data); if (ret != 1) { - printk(KERN_DEBUG "[TouchKey] %s, %d err\n", + printk(KERN_DEBUG "[Touchkey] %s: %d err\n", __func__, __LINE__); return size; } if (data != 1 && data != 2) { - printk(KERN_DEBUG "[TouchKey] %s wrong cmd %x\n", + printk(KERN_DEBUG "[Touchkey] %s: wrong cmd %x\n", __func__, data); return size; } @@ -1151,11 +1133,11 @@ static ssize_t touchkey_led_control(struct device *dev, } if (ret == -ENODEV) { - printk(KERN_DEBUG"[Touchkey] error to write i2c\n"); + pr_err("[Touchkey] error to write i2c\n"); touchled_cmd_reversed = 1; } - pr_debug("[TouchKey] %s touchkey_led_status=%d\n", __func__, data); + pr_debug("[Touchkey] %s: touchkey_led_status=%d\n", __func__, data); touchkey_led_status = data; return size; @@ -1182,10 +1164,10 @@ static ssize_t touch_led_force_disable_store(struct device *dev, ret = sscanf(buf, "%d\n", &data); if (unlikely(ret != 1)) { - pr_err("[Touchkey] %s err\n", __func__); + pr_err("[Touchkey] %s: err\n", __func__); return -EINVAL; } - pr_info("[Touchkey] %s value=%d\n", __func__, data); + pr_info("[Touchkey] %s: value=%d\n", __func__, data); if (data == 1) { i2c_touchkey_write(tkey_i2c->client, (u8 *) &ledCmd[1], 1); @@ -1218,10 +1200,10 @@ static ssize_t touch_led_timeout_store(struct device *dev, ret = sscanf(buf, "%d\n", &data); if (unlikely(ret != 1)) { - pr_err("[TouchKey] %s err\n", __func__); + pr_err("[Touchkey] %s: err\n", __func__); return -EINVAL; } - pr_info("[TouchKey] %s new timeout=%d\n", __func__, data); + pr_info("[Touchkey] %s: new timeout=%d\n", __func__, data); touch_led_timeout = data; return size; @@ -1241,7 +1223,7 @@ void touch_led_timedout_work(struct work_struct *work) if (touch_led_timeout != 0) { - pr_debug("[TouchKey] %s disabling touchled\n", __func__); + pr_debug("[Touchkey] %s: disabling touchled\n", __func__); i2c_touchkey_write(tkey_i2c->client, (u8 *) &ledCmd[1], 1); touchkey_led_status = TK_CMD_LED_OFF; } @@ -1254,21 +1236,21 @@ void touchscreen_state_report(int state) if (touch_led_disabled == 0) { if (state == 1) { if(touchkey_led_status == TK_CMD_LED_OFF) { - pr_debug("[TouchKey] %s enable touchleds\n", __func__); + pr_debug("[Touchkey] %s: enable touchleds\n", __func__); i2c_touchkey_write(tkey_i2c_local->client, (u8 *) &ledCmd[0], 1); touchkey_led_status = TK_CMD_LED_ON; } else { if (timer_pending(&touch_led_timer) == 1) { - pr_debug("[TouchKey] %s mod_timer\n", __func__); + pr_debug("[Touchkey] %s: mod_timer\n", __func__); mod_timer(&touch_led_timer, jiffies + (HZ * touch_led_timeout)); } } } else if (state == 0) { if (timer_pending(&touch_led_timer) == 1) { - pr_debug("[TouchKey] %s mod_timer\n", __func__); + pr_debug("[Touchkey] %s: mod_timer\n", __func__); mod_timer(&touch_led_timer, jiffies + (HZ * touch_led_timeout)); } else if (touchkey_led_status == TK_CMD_LED_ON){ - pr_debug("[TouchKey] %s add_timer\n", __func__); + pr_debug("[Touchkey] %s: add_timer\n", __func__); touch_led_timer.expires = jiffies + (HZ * touch_led_timeout); add_timer(&touch_led_timer); } @@ -1276,7 +1258,7 @@ void touchscreen_state_report(int state) } } -#if defined(TK_USE_4KEY) +#if defined(TK_USE_4KEY) || defined(CONFIG_TARGET_LOCALE_NAATT) || defined(CONFIG_TARGET_LOCALE_NA) static ssize_t touchkey_menu_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1284,20 +1266,20 @@ static ssize_t touchkey_menu_show(struct device *dev, u8 data[18] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[Touchkey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 18); #ifdef CONFIG_TARGET_LOCALE_NA if (tkey_i2c->module_ver < 8) { - printk(KERN_DEBUG "called %s data[12] =%d,data[13] = %d\n", + pr_debug("[Touchkey] %s: data[12] =%d,data[13] = %d\n", __func__, data[12], data[13]); menu_sensitivity = ((0x00FF & data[12]) << 8) | data[13]; } else { - printk(KERN_DEBUG "called %s data[17] =%d\n", __func__, + pr_debug("[Touchkey] %s: data[17] =%d\n", __func__, data[17]); menu_sensitivity = data[17]; } #else - printk(KERN_DEBUG "called %s data[10] =%d,data[11] = %d\n", __func__, + pr_debug("[Touchkey] %s: data[10] =%d,data[11] = %d\n", __func__, data[10], data[11]); menu_sensitivity = ((0x00FF & data[10]) << 8) | data[11]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -1311,20 +1293,20 @@ static ssize_t touchkey_home_show(struct device *dev, u8 data[18] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[TouchKey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 18); #ifdef CONFIG_TARGET_LOCALE_NA if (tkey_i2c->module_ver < 8) { - printk(KERN_DEBUG "called %s data[10] =%d,data[11] = %d\n", + pr_debug("[Touchkey] %s: data[10] =%d,data[11] = %d\n", __func__, data[10], data[11]); home_sensitivity = ((0x00FF & data[10]) << 8) | data[11]; } else { - printk(KERN_DEBUG "called %s data[15] =%d\n", __func__, + pr_debug("[Touchkey] %s: data[15] =%d\n", __func__, data[15]); home_sensitivity = data[15]; } #else - printk(KERN_DEBUG "called %s data[12] =%d,data[13] = %d\n", __func__, + pr_debug("[Touchkey] %s: data[12] =%d,data[13] = %d\n", __func__, data[12], data[13]); home_sensitivity = ((0x00FF & data[12]) << 8) | data[13]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -1338,20 +1320,20 @@ static ssize_t touchkey_back_show(struct device *dev, u8 data[18] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[TouchKey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 18); #ifdef CONFIG_TARGET_LOCALE_NA if (tkey_i2c->module_ver < 8) { - printk(KERN_DEBUG "called %s data[8] =%d,data[9] = %d\n", + pr_debug("[Touchkey] %s: data[8] =%d,data[9] = %d\n", __func__, data[8], data[9]); back_sensitivity = ((0x00FF & data[8]) << 8) | data[9]; } else { - printk(KERN_DEBUG "called %s data[13] =%d\n", __func__, + pr_debug("[Touchkey] %s: data[13] =%d\n", __func__, data[13]); back_sensitivity = data[13]; } #else - printk(KERN_DEBUG "called %s data[14] =%d,data[15] = %d\n", __func__, + pr_debug("[Touchkey] %s: data[14] =%d,data[15] = %d\n", __func__, data[14], data[15]); back_sensitivity = ((0x00FF & data[14]) << 8) | data[15]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -1365,20 +1347,20 @@ static ssize_t touchkey_search_show(struct device *dev, u8 data[18] = { 0, }; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[TouchKey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 18); #ifdef CONFIG_TARGET_LOCALE_NA if (tkey_i2c->module_ver < 8) { - printk(KERN_DEBUG "called %s data[6] =%d,data[7] = %d\n", + pr_debug("[Touchkey] %s: data[6] =%d,data[7] = %d\n", __func__, data[6], data[7]); search_sensitivity = ((0x00FF & data[6]) << 8) | data[7]; } else { - printk(KERN_DEBUG "called %s data[11] =%d\n", __func__, + pr_debug("[Touchkey] %s: data[11] =%d\n", __func__, data[11]); search_sensitivity = data[11]; } #else - printk(KERN_DEBUG "called %s data[16] =%d,data[17] = %d\n", __func__, + pr_debug("[Touchkey] %s: data[16] =%d,data[17] = %d\n", __func__, data[16], data[17]); search_sensitivity = ((0x00FF & data[16]) << 8) | data[17]; #endif /* CONFIG_TARGET_LOCALE_NA */ @@ -1397,13 +1379,13 @@ static ssize_t touchkey_menu_show(struct device *dev, ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 14); - printk(KERN_DEBUG "called %s data[13] =%d\n", __func__, data[13]); + pr_debug("[Touchkey] %s: data[13] =%d\n", __func__, data[13]); menu_sensitivity = data[13]; #else u8 data[10]; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[TouchKey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); menu_sensitivity = data[7]; #endif @@ -1422,13 +1404,13 @@ static ssize_t touchkey_back_show(struct device *dev, ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 14); - printk(KERN_DEBUG "called %s data[11] =%d\n", __func__, data[11]); + pr_debug("[Touchkey] %s: data[11] =%d\n", __func__, data[11]); back_sensitivity = data[11]; #else u8 data[10]; int ret; - printk(KERN_DEBUG "called %s\n", __func__); + pr_debug("[TouchKey] %s called\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 10); back_sensitivity = data[9]; #endif @@ -1459,7 +1441,7 @@ static ssize_t autocalibration_status(struct device *dev, int ret; struct touchkey_i2c *tkey_i2c = dev_get_drvdata(dev); - printk(KERN_DEBUG "[Touchkey] %s\n", __func__); + pr_debug("[Touchkey] %s\n", __func__); ret = i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 6); if ((data[5] & TK_BIT_AUTOCAL)) @@ -1505,20 +1487,19 @@ static ssize_t set_touchkey_update_show(struct device *dev, while (retry--) { if (ISSP_main(tkey_i2c) == 0) { - printk(KERN_ERR - "[TouchKey]Touchkey_update succeeded\n"); + pr_err("[TouchKey] Touchkey_update succeeded\n"); tkey_i2c->update_status = TK_UPDATE_PASS; count = 1; msleep(50); break; } - printk(KERN_ERR "touchkey_update failed... retry...\n"); + pr_err("[TouchKey] touchkey_update failed... retry...\n"); } if (retry <= 0) { /* disable ldo11 */ tkey_i2c->pdata->power_on(0); count = 0; - printk(KERN_ERR "[TouchKey]Touchkey_update fail\n"); + pr_err("[TouchKey] Touchkey_update fail\n"); tkey_i2c->update_status = TK_UPDATE_FAIL; enable_irq(tkey_i2c->irq); return count; @@ -1549,8 +1530,8 @@ static ssize_t set_touchkey_firm_version_read_show(struct device *dev, i2c_touchkey_read(tkey_i2c->client, KEYCODE_REG, data, 3); count = sprintf(buf, "0x%x\n", data[1]); - printk(KERN_DEBUG "[TouchKey] touch_version_read 0x%x\n", data[1]); - printk(KERN_DEBUG "[TouchKey] module_version_read 0x%x\n", data[2]); + pr_debug("[TouchKey] touch_version_read 0x%x\n", data[1]); + pr_debug("[TouchKey] module_version_read 0x%x\n", data[2]); return count; } @@ -1561,8 +1542,7 @@ static ssize_t set_touchkey_firm_status_show(struct device *dev, struct touchkey_i2c *tkey_i2c = dev_get_drvdata(dev); int count = 0; - printk(KERN_DEBUG - "[TouchKey] touch_update_read: update_status %d\n", + pr_debug("[TouchKey] touch_update_read: update_status %d\n", tkey_i2c->update_status); if (tkey_i2c->update_status == TK_UPDATE_PASS) @@ -1606,7 +1586,7 @@ static DEVICE_ATTR(touchkey_brightness, S_IRUGO | S_IWUSR | S_IWGRP, NULL, brightness_control); #endif -#if defined(CONFIG_TARGET_LOCALE_NAATT) +#if 0 /* #if defined(CONFIG_TARGET_LOCALE_NAATT) */ static DEVICE_ATTR(touchkey_autocal_start, S_IRUGO | S_IWUSR | S_IWGRP, NULL, set_touchkey_autocal_testmode); #endif @@ -1645,7 +1625,7 @@ static struct attribute *touchkey_attributes[] = { #ifdef LED_LDO_WITH_REGULATOR &dev_attr_touchkey_brightness.attr, #endif -#if defined(CONFIG_TARGET_LOCALE_NAATT) +#if 0/* defined(CONFIG_TARGET_LOCALE_NAATT) */ &dev_attr_touchkey_autocal_start.attr, #endif #if defined(TK_HAS_AUTOCAL) @@ -1682,7 +1662,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, int i; int ret; - printk(KERN_DEBUG "[TouchKey] i2c_touchkey_probe\n"); + pr_debug("[TouchKey] i2c_touchkey_probe\n"); if (pdata == NULL) { printk(KERN_ERR "%s: no pdata\n", __func__); @@ -1692,7 +1672,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, /*Check I2C functionality */ ret = i2c_check_functionality(client->adapter, I2C_FUNC_I2C); if (ret == 0) { - printk(KERN_ERR "[Touchkey] No I2C functionality found\n"); + pr_err("[Touchkey] No I2C functionality found\n"); ret = -ENODEV; return ret; } @@ -1700,7 +1680,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, /*Obtain kernel memory space for touchkey i2c */ tkey_i2c = kzalloc(sizeof(struct touchkey_i2c), GFP_KERNEL); if (NULL == tkey_i2c) { - printk(KERN_ERR "[Touchkey] failed to allocate tkey_i2c.\n"); + pr_err("[Touchkey] failed to allocate tkey_i2c.\n"); return -ENOMEM; } tkey_i2c_local = tkey_i2c; @@ -1708,7 +1688,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, input_dev = input_allocate_device(); if (!input_dev) { - printk(KERN_ERR "[Touchkey] failed to allocate input device\n"); + pr_err("[Touchkey] failed to allocate input device\n"); kfree(tkey_i2c); return -ENOMEM; } @@ -1737,7 +1717,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, ret = input_register_device(input_dev); if (ret) { - printk(KERN_ERR "[Touchkey] failed to register input device\n"); + pr_err("[Touchkey] failed to register input device\n"); input_free_device(input_dev); kfree(tkey_i2c); return err; @@ -1755,27 +1735,24 @@ static int i2c_touchkey_probe(struct i2c_client *client, tkey_i2c->dev = device_create(sec_class, NULL, 0, NULL, "sec_touchkey"); if (IS_ERR(tkey_i2c->dev)) { - printk(KERN_ERR "Failed to create device(tkey_i2c->dev)!\n"); + pr_err("[TouchKey] Failed to create device(tkey_i2c->dev)!\n"); input_unregister_device(input_dev); } else { dev_set_drvdata(tkey_i2c->dev, tkey_i2c); ret = sysfs_create_group(&tkey_i2c->dev->kobj, &touchkey_attr_group); if (ret) { - printk(KERN_ERR - "[TouchKey]: failed to create sysfs group\n"); + pr_err("[TouchKey]: failed to create sysfs group\n"); } } #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_C1) gpio_request(GPIO_OLED_DET, "OLED_DET"); ret = gpio_get_value(GPIO_OLED_DET); - printk(KERN_DEBUG - "[TouchKey] OLED_DET = %d\n", ret); + pr_debug("[TouchKey] OLED_DET = %d\n", ret); if (ret == 0) { - printk(KERN_DEBUG - "[TouchKey] device wasn't connected to board\n"); + pr_debug("[TouchKey] device wasn't connected to board\n"); input_unregister_device(input_dev); touchkey_probe = false; @@ -1784,7 +1761,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, #else ret = touchkey_i2c_check(tkey_i2c); if (ret < 0) { - printk(KERN_DEBUG"[TouchKey] probe failed\n"); + pr_debug("[TouchKey] probe failed\n"); input_unregister_device(input_dev); touchkey_probe = false; return -EBUSY; @@ -1796,7 +1773,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, IRQF_DISABLED | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, tkey_i2c->name, tkey_i2c); if (ret < 0) { - printk(KERN_ERR "[Touchkey]: failed to request irq(%d) - %d\n", + pr_err("[Touchkey]: failed to request irq(%d) - %d\n", tkey_i2c->irq, ret); input_unregister_device(input_dev); touchkey_probe = false; @@ -1808,7 +1785,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, #if defined(TK_HAS_FIRMWARE_UPDATE) ret = touchkey_firmware_update(tkey_i2c); if (ret < 0) { - printk(KERN_ERR "[Touchkey]: failed firmware updating process (%d)\n", + pr_err("[Touchkey]: failed firmware updating process (%d)\n", ret); input_unregister_device(input_dev); touchkey_probe = false; @@ -1833,7 +1810,7 @@ static int i2c_touchkey_probe(struct i2c_client *client, tkey_i2c->wq = create_singlethread_workqueue("tkey_i2c_wq"); if (!tkey_i2c->wq) { ret = -ENOMEM; - pr_err("%s: could not create workqueue\n", __func__); + pr_err("[Touchkey] %s: could not create workqueue\n", __func__); } /* this is the thread function we run on the work queue */ @@ -1856,13 +1833,13 @@ static int __init touchkey_init(void) #if defined(CONFIG_MACH_M0) if (system_rev < TOUCHKEY_FW_UPDATEABLE_HW_REV) { - printk(KERN_DEBUG "[Touchkey] Doesn't support this board rev %d\n", + pr_debug("[Touchkey] Doesn't support this board rev %d\n", system_rev); return 0; } #elif defined(CONFIG_MACH_C1) if (system_rev < TOUCHKEY_FW_UPDATEABLE_HW_REV) { - printk(KERN_DEBUG "[Touchkey] Doesn't support this board rev %d\n", + pr_debug("[Touchkey] Doesn't support this board rev %d\n", system_rev); return 0; } @@ -1875,7 +1852,7 @@ static int __init touchkey_init(void) ret = i2c_add_driver(&touchkey_i2c_driver); if (ret) { - printk(KERN_ERR "[TouchKey] registration failed, module not inserted.ret= %d\n", + pr_err("[TouchKey] registration failed, module not inserted.ret= %d\n", ret); } #ifdef TEST_JIG_MODE @@ -1891,7 +1868,7 @@ static int __init touchkey_init(void) static void __exit touchkey_exit(void) { - printk(KERN_DEBUG "[TouchKey] %s\n", __func__); + pr_debug("[TouchKey] %s\n", __func__); i2c_del_driver(&touchkey_i2c_driver); } |