diff --git a/drivers/input/touchscreen/himax_0flash_mmi/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/Android.mk
index 806dd1779762..70360edc30eb 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/Android.mk
+++ b/drivers/input/touchscreen/himax_0flash_mmi/Android.mk
@@ -8,26 +8,26 @@ HIMAX_MMI_MODULE_PATH := $(KERNEL_MODULES_OUT)
 endif
 
 ifeq ($(HIMAX_V2_MMI_0FLASH),true)
-	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_0FLASH=y
+	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_0FLASH=y
 endif
 ifneq ($(BOARD_USES_TOUCH_PALM),)
-	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
+	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
 endif
 
 ifneq ($(BOARD_USES_DOUBLE_TAP),)
-	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_DOUBLE_TAP=y
+	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_DOUBLE_TAP=y
 endif
 
 ifneq ($(BOARD_USES_HIMAX_MULTI_BIN),)
-	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_MULTI_BIN=y
+	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_MULTI_BIN=y
 endif
 
 ifeq ($(HIMAX_V2_MMI_HX83102D),true)
-	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D=hx83102d
+	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D=hx83102d
 endif
 
 ifeq ($(HIMAX_V2_MMI_HX83112F),true)
-	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F=hx83112f
+	KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112f
 endif
 
 ifneq ($(BOARD_USES_PANEL_NOTIFICATIONS),)
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/Kbuild
index 7c09fc506e29..bef5812282e4 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/Kbuild
+++ b/drivers/input/touchscreen/himax_0flash_mmi/Kbuild
@@ -8,7 +8,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
 EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
 EXTRA_CFLAGS += -DCONFIG_HMX_DB
 
-ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
+ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
 	EXTRA_CFLAGS += -DHX_FIX_TOUCH_INFO
 	EXTRA_CFLAGS += -DHX_112F_SET
@@ -16,28 +16,28 @@ ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
 	EXTRA_CFLAGS += -DFIX_WVLA
 endif
 
-ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
+ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
 endif
 
-ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
+ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83102_MOD__
 endif
 
-ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
+ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83102D_MOD__
 	EXTRA_CFLAGS += -DHX_CODE_OVERLAY
 endif
 
-ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
 	EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
 endif
 
-ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_DOUBLE_TAP)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_DOUBLE_TAP)),)
 	EXTRA_CFLAGS += -DHIMAX_V2_SENSOR_EN
 endif
 
-ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_V2_MMI_ENABLE_MULTI_BIN)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_ENABLE_MULTI_BIN)),)
 	EXTRA_CFLAGS += -DHIMAX_V2_MULTI_BIN
 endif
 
@@ -47,7 +47,7 @@ endif
 
 obj-m := himax_0flash_mmi.o
 
-ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_0FLASH)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_0FLASH)),)
 	himax_0flash_mmi-objs += himax_platform_QCT_SPI.o
 	EXTRA_CFLAGS += -D__HIMAX_PLATFORM_SPI__ \
 			-DHX_ZERO_FLASH
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Android.mk
index e7661e28b814..441126d8e1a5 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Android.mk
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Android.mk
@@ -7,7 +7,9 @@ else
 HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
 endif
 
-KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME=hx83102
+ifeq ($(HIMAX_V2_MMI_HX83102),true)
+KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83102
+endif
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := himax_0flash_mmi_hx83102.ko
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Kbuild
index 47fcb3b3b68b..eea8242d9089 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Kbuild
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102/Kbuild
@@ -10,7 +10,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
 EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
 EXTRA_CFLAGS += -DCONFIG_HMX_DB
 
-ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
+ifneq ($(filter hx83102,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83102_MOD__
 endif
 
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Android.mk
index f521969f9a8b..57c41e5cce97 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Android.mk
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Android.mk
@@ -7,8 +7,8 @@ else
 HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
 endif
 
-ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
-KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D=hx83102d
+ifeq ($(HIMAX_V2_MMI_HX83102D),true)
+KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D=hx83102d
 endif
 
 
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Kbuild
index c90d94dd14fb..f68b432ae4a8 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Kbuild
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83102d/Kbuild
@@ -10,7 +10,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
 EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
 EXTRA_CFLAGS += -DCONFIG_HMX_DB
 
-ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_D)),)
+ifneq ($(filter hx83102d,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME_D)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83102D_MOD__
 	EXTRA_CFLAGS += -DHX_ZERO_FLASH
 	EXTRA_CFLAGS += -DHX_CODE_OVERLAY
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Android.mk
index cd5d3bb9401a..819a98e475e4 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Android.mk
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Android.mk
@@ -7,10 +7,12 @@ else
 HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
 endif
 
-KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME=hx83112
+ifeq ($(HIMAX_V2_MMI_HX83112),true)
+KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112
+endif
 
 ifneq ($(BOARD_USES_TOUCH_PALM),)
-	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
+	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
 endif
 
 include $(CLEAR_VARS)
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Kbuild
index fb727d924499..a199508dde20 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Kbuild
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112/Kbuild
@@ -10,11 +10,11 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
 EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
 EXTRA_CFLAGS += -DCONFIG_HMX_DB
 
-ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),)
+ifneq ($(filter hx83112,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
 endif
 
-ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
 	EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
 endif
 
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Android.mk
index 28b007a20aa0..de6eae1b98d5 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Android.mk
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Android.mk
@@ -7,10 +7,12 @@ else
 HIMAX_MMI_IC_MODULE_PATH := $(KERNEL_MODULES_OUT)
 endif
 
-KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F=hx83112f
+ifeq ($(HIMAX_V2_MMI_HX83112F),true)
+KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME=hx83112f
+endif
 
 ifneq ($(BOARD_USES_TOUCH_PALM),)
-	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM=y
+	KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM=y
 endif
 
 include $(CLEAR_VARS)
diff --git a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Kbuild
index c98311244873..b88f7fdf75f0 100644
--- a/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Kbuild
+++ b/drivers/input/touchscreen/himax_0flash_mmi/support_ic/himax_0flash_mmi_hx83112f/Kbuild
@@ -10,13 +10,13 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \
 EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL
 EXTRA_CFLAGS += -DCONFIG_HMX_DB
 
-ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),)
+ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_0FLASH_MMI_IC_NAME)),)
 	EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__
 	EXTRA_CFLAGS += -DHX_112F_SET
 	EXTRA_CFLAGS += -DHX_ZERO_FLASH
 endif
 
-ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_V2_MMI_ENABLE_PALM)),)
+ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_HIMAX_0FLASH_MMI_ENABLE_PALM)),)
 	EXTRA_CFLAGS += -DHIMAX_PALM_SENSOR_EN
 endif