diff --git a/target/linux/mxs/config-3.14 b/target/linux/mxs/config-3.14
index bded4131d9..ead8dc3577 100644
--- a/target/linux/mxs/config-3.14
+++ b/target/linux/mxs/config-3.14
@@ -157,15 +157,12 @@ CONFIG_I2C_ALGOPCF=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_COMPAT=y
-CONFIG_I2C_DEBUG_ALGO=y
-CONFIG_I2C_DEBUG_BUS=y
-CONFIG_I2C_DEBUG_CORE=y
 CONFIG_I2C_MUX=y
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PCA954x is not set
 CONFIG_I2C_MUX_PINCTRL=y
-CONFIG_I2C_MXS=y
+# CONFIG_I2C_MXS is not set
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_KFIFO_BUF=y
diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk
index afcf23865c..75d668a1d0 100644
--- a/target/linux/mxs/modules.mk
+++ b/target/linux/mxs/modules.mk
@@ -99,3 +99,18 @@ define KernelPackage/spi-mxs/description
 endef
 
 $(eval $(call KernelPackage,spi-mxs))
+
+I2C_MXS_MODULES:= \
+  CONFIG_I2C_MXS:drivers/i2c/busses/i2c-mxs
+
+define KernelPackage/i2c-mxs
+  $(call i2c_defaults,$(I2C_MXS_MODULES),55)
+  TITLE:=Freescale i.MX23/28 I2C driver
+  DEPENDS:=@TARGET_mxs +kmod-i2c-core
+endef
+
+define KernelPackage/i2c-mxs/description
+    Kernel module for Freescale i.MX23/28 I2C controller
+endef
+
+$(eval $(call KernelPackage,i2c-mxs))