diff --git a/drivers/input/touchscreen/himax_v2_mmi/himax_common.c b/drivers/input/touchscreen/himax_v2_mmi/himax_common.c
index 96112bcdebcb..802b37b3e598 100644
--- a/drivers/input/touchscreen/himax_v2_mmi/himax_common.c
+++ b/drivers/input/touchscreen/himax_v2_mmi/himax_common.c
@@ -190,7 +190,6 @@ int g_zero_event_count;
 
 #endif
 
-static bool chip_test_r_flag;
 u8 HX_HW_RESET_ACTIVATE;
 
 static uint8_t AA_press;
@@ -235,6 +234,9 @@ EXPORT_SYMBOL(g_ts_dbg);
 #define HIMAX_PROC_SELF_TEST_FILE	"self_test"
 struct proc_dir_entry *himax_proc_self_test_file;
 
+#define HIMAX_PROC_SELF_TEST_RAW_FILE	"self_test_rawdata"
+struct proc_dir_entry *himax_proc_self_raw_file = NULL;
+
 uint8_t HX_PROC_SEND_FLAG;
 EXPORT_SYMBOL(HX_PROC_SEND_FLAG);
 
@@ -285,6 +287,133 @@ static int himax_palm_detect(uint8_t *buf)
 }
 #endif
 
+static ssize_t himax_self_test_write(struct file *file, const char *buff,
+									size_t len, loff_t *pos)
+{
+	int i = 0;
+	char buf[80] = {0};
+
+	if (len >= 80) {
+		I("%s: no command exceeds 80 chars.\n", __func__);
+		return -EFAULT;
+	}
+
+	if (copy_from_user(buf, buff, len)) {
+		return -EFAULT;
+	}
+
+	if (hx_self_test_file_name == NULL) {
+		E("file name is NULL\n");
+		hx_self_test_file_name = kzalloc(80, GFP_KERNEL);
+		snprintf(hx_self_test_file_name, 15, "hx_criteria.csv");
+	}
+
+	for (i = 0; i < 80; i++) {
+		if (buf[i] == ',' || buf[i] == '\n') {
+			memset(hx_self_test_file_name, 0x0, 80);
+			memcpy(hx_self_test_file_name, buf, i);
+			I("%s: Get name from Customer\n", __func__);
+			break;
+		}
+	}
+	if (i == 80) {
+		memset(hx_self_test_file_name, 0x0, 80);
+		snprintf(hx_self_test_file_name, 16, "hx_criteria.csv");
+		I("%s: Use default name\n", __func__);
+		}
+	I("file name = %s\n", hx_self_test_file_name);
+
+	return len;
+}
+
+static ssize_t himax_self_test_read(struct file *file, char *buf,
+									size_t len, loff_t *pos)
+{
+	int val = 0x00;
+	size_t ret = 0;
+	char *temp_buf;
+	I("%s: enter, %d \n", __func__, __LINE__);
+
+	if (!HX_PROC_SEND_FLAG) {
+		temp_buf = kzalloc(len, GFP_KERNEL);
+		himax_int_enable(0);/* disable irq */
+		private_ts->in_self_test = 1;
+		val = g_core_fp.fp_chip_self_test();
+#ifdef HX_ESD_RECOVERY
+		HX_ESD_RESET_ACTIVATE = 1;
+#endif
+		himax_int_enable(1);/* enable irq */
+
+		if (val == 0x00) {
+			ret += snprintf(temp_buf + ret, len - ret, "Self_Test Pass\n");
+		} else {
+			ret += snprintf(temp_buf + ret, len - ret, "Self_Test Fail\n");
+		}
+
+		private_ts->in_self_test = 0;
+
+		if (copy_to_user(buf, temp_buf, len))
+			I("%s,here:%d\n", __func__, __LINE__);
+
+		kfree(temp_buf);
+		HX_PROC_SEND_FLAG = 1;
+	} else {
+		HX_PROC_SEND_FLAG = 0;
+	}
+
+	return ret;
+}
+
+static struct file_operations himax_proc_self_test_ops = {
+	.owner = THIS_MODULE,
+	.read = himax_self_test_read,
+	.write = himax_self_test_write,
+};
+
+static void *himax_self_raw_seq_start(struct seq_file *s, loff_t *pos)
+{
+	if (*pos >= 1) {
+		return NULL;
+	}
+	return (void *)((unsigned long) *pos + 1);
+}
+
+static void *himax_self_raw_seq_next(struct seq_file *s, void *v, loff_t *pos)
+{
+	return NULL;
+}
+
+static void himax_self_raw_seq_stop(struct seq_file *s, void *v)
+{
+}
+
+static int himax_self_raw_seq_read(struct seq_file *s, void *v)
+{
+	size_t ret = 0;
+
+	if (g_rslt_data != NULL) {
+			seq_printf(s, "%s", g_rslt_data);
+		}
+	return ret;
+}
+static struct seq_operations himax_self_raw_seq_ops = {
+	.start	= himax_self_raw_seq_start,
+	.next	= himax_self_raw_seq_next,
+	.stop	= himax_self_raw_seq_stop,
+	.show	= himax_self_raw_seq_read,
+};
+static int himax_self_raw_proc_open(struct inode *inode, struct file *file)
+{
+	return seq_open(file, &himax_self_raw_seq_ops);
+};
+
+static struct file_operations himax_proc_self_raw_ops = {
+	.owner = THIS_MODULE,
+	.open = himax_self_raw_proc_open,
+	.read = seq_read,
+};
+
+#if 0
 static ssize_t himax_self_test(struct seq_file *s, void *v)
 {
 	int val = 0x00;
@@ -508,6 +637,7 @@ static const struct file_operations himax_proc_self_test_ops = {
 	.write = himax_self_test_write,
 	.release = seq_release,
 };
+#endif
 
 #ifdef HX_HIGH_SENSE
 static ssize_t himax_HSEN_read(struct file *file, char *buf,
@@ -832,6 +962,12 @@ int himax_common_proc_init(void)
 		goto fail_1;
 	}
 
+	himax_proc_self_raw_file = proc_create(HIMAX_PROC_SELF_TEST_RAW_FILE, 0444, himax_touch_proc_dir, &himax_proc_self_raw_ops);
+	if (himax_proc_self_raw_file == NULL) {
+		E(" %s: proc self_test raw file create failed!\n", __func__);
+		goto fail_1_1;
+	}
+
 #ifdef HX_HIGH_SENSE
 	himax_proc_HSEN_file = proc_create(HIMAX_PROC_HSEN_FILE, 0666,
 									   himax_touch_proc_dir, &himax_proc_HSEN_ops);
@@ -896,6 +1032,8 @@ fail_3:
 	remove_proc_entry(HIMAX_PROC_HSEN_FILE, himax_touch_proc_dir);
 fail_2:
 #endif
+	remove_proc_entry(HIMAX_PROC_SELF_TEST_RAW_FILE, himax_touch_proc_dir);
+fail_1_1:
 	remove_proc_entry(HIMAX_PROC_SELF_TEST_FILE, himax_touch_proc_dir);
 fail_1:
 	return -ENOMEM;
@@ -904,6 +1042,7 @@ fail_1:
 void himax_common_proc_deinit(void)
 {
 remove_proc_entry(HIMAX_PROC_SELF_TEST_FILE, himax_touch_proc_dir);
+remove_proc_entry(HIMAX_PROC_SELF_TEST_RAW_FILE, himax_touch_proc_dir);
 
 #ifdef HX_EDGE_LIMIT
 	remove_proc_entry(HIMAX_PROC_EDGE_LIMIT_FILE, himax_touch_proc_dir);
diff --git a/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.c b/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.c
index 9e274aa7c85d..fb838285c49c 100644
--- a/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.c
+++ b/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.c
@@ -32,6 +32,7 @@ char *g_rslt_data;
 static char g_file_path[256];
 static char g_rslt_log[256];
 static char g_start_log[256];
+char *hx_self_test_file_name = NULL;
 
 char *g_himax_inspection_mode[] = {
 	"HIMAX_INSPECTION_OPEN",
@@ -1639,7 +1640,6 @@ static int himax_parse_criteria_file(void)
 {
 	int err = HX_INSPECT_OK;
 	const struct firmware *file_entry = NULL;
-	char *file_name = "hx_criteria.csv";
 	char **result;
 	int i = 0;
 	int crtra_count = HX_CRITERIA_SIZE;
@@ -1651,10 +1651,16 @@ static int himax_parse_criteria_file(void)
 	int size_of_result_str = 0;
 
 	I("%s,Entering\n", __func__);
-	I("file name = %s\n", file_name);
+	if (hx_self_test_file_name == NULL) {
+		E("file name is NULL\n");
+		hx_self_test_file_name = kzalloc(80, GFP_KERNEL);
+		snprintf(hx_self_test_file_name, 16, "hx_criteria.csv");
+		I("%s: Use default name\n", __func__);
+	}
 
+	I("file name = %s\n", hx_self_test_file_name);
 	/* default path is /system/etc/firmware */
-	err = request_firmware(&file_entry, file_name, private_ts->dev);
+	err = request_firmware(&file_entry, hx_self_test_file_name, private_ts->dev);
 	if (err < 0) {
 		E("%s,fail in line%d error code=%d\n", __func__, __LINE__, err);
 		err = HX_INSPECT_EFILE;
@@ -1826,6 +1832,8 @@ static void himax_self_test_data_deinit(void)
 static int himax_chip_self_test(void)
 {
 	uint32_t ret = HX_INSPECT_OK;
+	uint8_t tmp_addr[DATA_LEN_4] = {0x94, 0x72, 0x00, 0x10};
+	uint8_t tmp_data[DATA_LEN_4] = {0x01, 0x00, 0x00, 0x00};
 
 #ifdef HX_CODE_OVERLAY
 	uint8_t normalfw[32] = "Himax_firmware.bin";
@@ -2043,11 +2051,14 @@ static int himax_chip_self_test(void)
 	)
 		himax_press_powerkey();
 
+/* Workaround delete */
+#if 0
 	/* Wait suspend done */
 	while (private_ts->suspend_resume_done != 1)
 		usleep_range(1000, 1001);
 
 	private_ts->suspend_resume_done = 0;
+#endif
 
 	if (g_inspt_crtra_flag[IDX_LPWUG_RAWDATA_MIN] == 1 &&
 	  g_inspt_crtra_flag[IDX_LPWUG_RAWDATA_MAX] == 1) {
@@ -2131,20 +2142,27 @@ static int himax_chip_self_test(void)
 
 	hx_test_data_pop_out(g_rslt_data, g_file_path);
 
+/* Workaround delete */
+#if 0
 	/* Wait resume done */
 	while (private_ts->suspend_resume_done != 1)
 		usleep_range(1000, 1001);
+#endif
 
 #ifdef HX_CODE_OVERLAY
 	private_ts->in_self_test = 0;
 	g_core_fp.fp_0f_op_file_dirly(normalfw);
 	hx_turn_on_mp_func(0);
+	/* set N frame back to default value 1*/
+	g_core_fp.fp_register_write(tmp_addr, 4, tmp_data, 0);
 	g_core_fp.fp_reload_disable(0);
 	g_core_fp.fp_sense_on(0);
 #else
 	g_core_fp.fp_sense_off(true);
 	hx_turn_on_mp_func(0);
-	himax_set_N_frame(1, HIMAX_INSPECTION_WEIGHT_NOISE);
+	/*himax_set_N_frame(1, HIMAX_INSPECTION_WEIGHT_NOISE);*/
+	/* set N frame back to default value 1*/
+	g_core_fp.fp_register_write(tmp_addr, 4, tmp_data, 0);
 #ifndef HX_ZERO_FLASH
 	if (g_core_fp.fp_reload_disable != NULL)
 		g_core_fp.fp_reload_disable(0);
diff --git a/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.h b/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.h
index 5c1985df9651..6b0f5dbfb46d 100644
--- a/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.h
+++ b/drivers/input/touchscreen/himax_v2_mmi/himax_inspection.h
@@ -208,3 +208,4 @@ enum HX_INSPECT_ERR_ENUM {
 };
 
 extern void himax_inspect_data_clear(void);
+extern char *hx_self_test_file_name;