diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild b/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild
deleted file mode 100644
index 6c16bf080aca..000000000000
--- a/drivers/input/touchscreen/goodix_berlin_mmi/Kbuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# add -Wall to try to catch everything we can.
-EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += \
-		-I$(TOP)/motorola/kernel/modules/include \
-		-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/goodix_berlin_mmi
-
-obj-m := goodix_brl_mmi.o
-goodix_brl_mmi-objs = goodix_brl_fwupdate.o goodix_brl_hw.o goodix_brl_i2c.o goodix_cfg_bin.o goodix_ts_core.o goodix_ts_utils.o
-
-obj-m += goodix_brl_tools_mmi.o
-goodix_brl_tools_mmi-objs = goodix_ts_tools.o
-
-obj-m += goodix_brl_gesture_mmi.o
-goodix_brl_gesture_mmi-objs = goodix_ts_gesture.o
-
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Android.mk b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Android.mk
new file mode 100644
index 000000000000..4366c1404a73
--- /dev/null
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Android.mk
@@ -0,0 +1,14 @@
+DLKM_DIR := motorola/kernel/modules
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+ifneq ($(findstring goodix_brl_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
+    KERNEL_CFLAGS += CONFIG_USE_TOUCHSCREEN_MMI_I2C=y
+    LOCAL_MODULE := goodix_brl_i2c.ko
+else
+    LOCAL_MODULE := goodix_brl_spi.ko
+endif
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+
+include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Kbuild b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Kbuild
new file mode 100644
index 000000000000..82610e5f6d5e
--- /dev/null
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/Kbuild
@@ -0,0 +1,11 @@
+# add -Wall to try to catch everything we can.
+EXTRA_CFLAGS += -Wall
+EXTRA_CFLAGS += \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/goodix_berlin_mmi/include
+
+ifneq ($(filter m y,$(CONFIG_USE_TOUCHSCREEN_MMI_I2C)),)
+	obj-m = goodix_brl_i2c.o
+else
+	obj-m = goodix_brl_spi.o
+endif
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_i2c.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/goodix_brl_i2c.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_i2c.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/goodix_brl_i2c.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_spi.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/goodix_brl_spi.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_spi.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_bus/goodix_brl_spi.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Android.mk b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Android.mk
new file mode 100644
index 000000000000..c926c05e14dc
--- /dev/null
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Android.mk
@@ -0,0 +1,13 @@
+DLKM_DIR := motorola/kernel/modules
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := goodix_brl_mmi.ko
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+ifneq ($(findstring goodix_brl_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
+    LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/goodix_brl_i2c.ko
+else
+    LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/goodix_brl_spi.ko
+endif
+include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Kbuild b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Kbuild
new file mode 100644
index 000000000000..caa0146d2193
--- /dev/null
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/Kbuild
@@ -0,0 +1,11 @@
+# add -Wall to try to catch everything we can.
+EXTRA_CFLAGS += -Wall
+EXTRA_CFLAGS += \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/goodix_berlin_mmi/include
+
+obj-m += goodix_brl_mmi.o
+
+goodix_brl_mmi-objs := goodix_brl_fwupdate.o goodix_brl_hw.o goodix_cfg_bin.o goodix_ts_core.o goodix_ts_utils.o
+
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../goodix_brl_bus/Module.symvers
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_brl_fwupdate.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_fwupdate.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_brl_fwupdate.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_brl_hw.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_hw.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_brl_hw.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_cfg_bin.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_cfg_bin.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_cfg_bin.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_cfg_bin.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_ts_core.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_ts_core.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_utils.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_ts_utils.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_utils.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_core/goodix_ts_utils.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Android.mk
similarity index 71%
rename from drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Android.mk
index 2cde0a851969..2fb097c7c676 100644
--- a/drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Android.mk
@@ -1,20 +1,16 @@
 DLKM_DIR := motorola/kernel/modules
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := goodix_brl_mmi.ko
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/AndroidKernelModule.mk
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := goodix_brl_tools_mmi.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/goodix_brl_mmi.ko
 include $(DLKM_DIR)/AndroidKernelModule.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := goodix_brl_gesture_mmi.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/goodix_brl_mmi.ko
 include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Kbuild b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Kbuild
new file mode 100644
index 000000000000..22d39364408e
--- /dev/null
+++ b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/Kbuild
@@ -0,0 +1,14 @@
+# add -Wall to try to catch everything we can.
+EXTRA_CFLAGS += -Wall
+EXTRA_CFLAGS += \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
+		-I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/goodix_berlin_mmi/include
+
+obj-m += goodix_brl_tools_mmi.o
+goodix_brl_tools_mmi-objs = goodix_ts_tools.o
+
+obj-m += goodix_brl_gesture_mmi.o
+goodix_brl_gesture_mmi-objs = goodix_ts_gesture.o
+
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../goodix_brl_core/Module.symvers
+
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_gesture.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/goodix_ts_gesture.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_gesture.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/goodix_ts_gesture.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_tools.c b/drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/goodix_ts_tools.c
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_tools.c
rename to drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_ext/goodix_ts_tools.c
diff --git a/drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h b/drivers/input/touchscreen/goodix_berlin_mmi/include/goodix_ts_core.h
similarity index 100%
rename from drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h
rename to drivers/input/touchscreen/goodix_berlin_mmi/include/goodix_ts_core.h