diff --git a/arch b/arch
index fe82498fb11..f8825890e59 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit fe82498fb11af76d0bda08c4fd969f4e5b60de0a
+Subproject commit f8825890e59d946bfffaf68e93ed5ecabebc5f04
diff --git a/configs b/configs
index 446de79f490..13a5278c9df 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 446de79f4904d30bd0f4a787b36775f2ccf65902
+Subproject commit 13a5278c9df0652122ecf6f458cab9fdf4d883b7
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 72f331cc040..9f4e625dd7b 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -9,10 +9,6 @@ config I2C_SLAVE
 	bool "I2C Slave"
 	default n
 
-config I2C_TRANSFER
-	bool "Support the I2C transfer() method"
-	default n
-
 config I2C_POLLED
 	bool "Polled I2C (no interrupts)"
 	default n
diff --git a/drivers/i2c/Make.defs b/drivers/i2c/Make.defs
index 4d1d737a576..8036cbcb755 100644
--- a/drivers/i2c/Make.defs
+++ b/drivers/i2c/Make.defs
@@ -37,9 +37,7 @@
 
 ifeq ($(CONFIG_I2C),y)
 
-ifeq ($(CONFIG_I2C_TRANSFER),y)
-  CSRCS += i2c_read.c i2c_write.c i2c_writeread.c
-endif
+CSRCS += i2c_read.c i2c_write.c i2c_writeread.c
 
 # Include I2C device driver build support
 
diff --git a/drivers/i2c/i2c_read.c b/drivers/i2c/i2c_read.c
index 1d7c16b8cb5..1c0a840cd4c 100644
--- a/drivers/i2c/i2c_read.c
+++ b/drivers/i2c/i2c_read.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/i2c/i2c_master.h>
 
-#if defined(CONFIG_I2C_TRANSFER)
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -96,4 +94,3 @@ int i2c_read(FAR struct i2c_master_s *dev,
   return I2C_TRANSFER(dev, &msg, 1);
 }
 
-#endif /* CONFIG_I2C_TRANSFER */
\ No newline at end of file
diff --git a/drivers/i2c/i2c_write.c b/drivers/i2c/i2c_write.c
index 725e150ce48..d98be5e2932 100644
--- a/drivers/i2c/i2c_write.c
+++ b/drivers/i2c/i2c_write.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/i2c/i2c_master.h>
 
-#if defined(CONFIG_I2C_TRANSFER)
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -91,4 +89,3 @@ int i2c_write(FAR struct i2c_master_s *dev,
   return I2C_TRANSFER(dev, &msg, 1);
 }
 
-#endif /* CONFIG_I2C_TRANSFER */
\ No newline at end of file
diff --git a/drivers/i2c/i2c_writeread.c b/drivers/i2c/i2c_writeread.c
index 571fa1b3057..da421680f61 100644
--- a/drivers/i2c/i2c_writeread.c
+++ b/drivers/i2c/i2c_writeread.c
@@ -43,8 +43,6 @@
 
 #include <nuttx/i2c/i2c_master.h>
 
-#if defined(CONFIG_I2C_TRANSFER)
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -117,4 +115,3 @@ int i2c_writeread(FAR struct i2c_master_s *dev,
   return I2C_TRANSFER(dev, msg, 2);
 }
 
-#endif /* CONFIG_I2C_TRANSFER */
\ No newline at end of file
diff --git a/drivers/ioexpander/pca9555.c b/drivers/ioexpander/pca9555.c
index f405a4a311d..a2607a8db96 100644
--- a/drivers/ioexpander/pca9555.c
+++ b/drivers/ioexpander/pca9555.c
@@ -64,10 +64,6 @@
 #  warning I2C support is required (CONFIG_I2C)
 #endif
 
-#ifndef CONFIG_I2C_TRANSFER
-#  warning Support of the I2C transfer() method is required (CONFIG_I2C_TRANSFER)
-#endif
-
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
diff --git a/drivers/ioexpander/pca9555.h b/drivers/ioexpander/pca9555.h
index c7d24676744..cb81eb27dd1 100644
--- a/drivers/ioexpander/pca9555.h
+++ b/drivers/ioexpander/pca9555.h
@@ -63,8 +63,6 @@
 /* Prerequisites:
  *   CONFIG_I2C
  *     I2C support is required
- *   CONFIG_I2C_TRANSFER
- *     Support for the I2C transfer method is required.
  *   CONFIG_IOEXPANDER
  *     Enables support for the PCA9555 I/O expander
  *
diff --git a/drivers/sensors/lis331dl.c b/drivers/sensors/lis331dl.c
index 7802eb086a2..de4887ef2d7 100644
--- a/drivers/sensors/lis331dl.c
+++ b/drivers/sensors/lis331dl.c
@@ -49,7 +49,7 @@
 #include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lis331dl.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_I2C_TRANSFER) && defined(CONFIG_LIS331DL)
+#if defined(CONFIG_I2C) && defined(CONFIG_LIS331DL)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -377,4 +377,4 @@ lis331dl_getreadings(FAR struct lis331dl_dev_s * dev)
   return NULL;
 }
 
-#endif /* CONFIG_I2C && CONFIG_I2C_TRANSFER && CONFIG_LIS331DL */
+#endif /* CONFIG_I2C && CONFIG_LIS331DL */
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index 0dd27bc754a..bff34b437ae 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -66,10 +66,6 @@
 #  error CONFIG_RTC_HIRES must NOT be set with this driver
 #endif
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error CONFIG_I2C_TRANSFER is required by this driver
-#endif
-
 #ifndef CONFIG_DS3231_I2C_FREQUENCY
 #  error CONFIG_DS3231_I2C_FREQUENCY is not configured
 #  define CONFIG_DS3231_I2C_FREQUENCY 400000
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index ac6359c9da3..d6318820ef4 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -66,10 +66,6 @@
 #  error CONFIG_RTC_HIRES must NOT be set with this driver
 #endif
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error CONFIG_I2C_TRANSFER is required by this driver
-#endif
-
 #ifndef CONFIG_PCF85263_I2C_FREQUENCY
 #  error CONFIG_PCF85263_I2C_FREQUENCY is not configured
 #  define CONFIG_PCF85263_I2C_FREQUENCY 400000
diff --git a/include/nuttx/audio/wm8904.h b/include/nuttx/audio/wm8904.h
index a10c69739ec..5b2bd7e5491 100644
--- a/include/nuttx/audio/wm8904.h
+++ b/include/nuttx/audio/wm8904.h
@@ -84,10 +84,6 @@
 #  error CONFIG_I2C is required by the WM8904 driver
 #endif
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error CONFIG_I2C_TRANSFER is required in the I2C configuration
-#endif
-
 #ifndef CONFIG_SCHED_WORKQUEUE
 #  error CONFIG_SCHED_WORKQUEUE is required by the WM8904 driver
 #endif
diff --git a/include/nuttx/i2c/i2c_master.h b/include/nuttx/i2c/i2c_master.h
index b181beca28a..a8b91f82266 100644
--- a/include/nuttx/i2c/i2c_master.h
+++ b/include/nuttx/i2c/i2c_master.h
@@ -196,10 +196,8 @@ struct i2c_ops_s
            int buflen);
   int    (*read)(FAR struct i2c_master_s *dev, FAR uint8_t *buffer,
            int buflen);
-#ifdef CONFIG_I2C_TRANSFER
   int    (*transfer)(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s *msgs,
            int count);
-#endif
 };
 
 /* This structure contains the full state of I2C as needed for a specific
@@ -318,11 +316,9 @@ int up_i2creset(FAR struct i2c_master_s *dev);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_I2C_TRANSFER
 int i2c_writeread(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
                   FAR const uint8_t *wbuffer, int wbuflen,
                   FAR uint8_t *rbuffer, int rbuflen);
-#endif
 
 /****************************************************************************
  * Name: i2c_write
@@ -343,10 +339,8 @@ int i2c_writeread(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *c
  *
  ****************************************************************************/
 
-#ifdef CONFIG_I2C_TRANSFER
 int i2c_write(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
               FAR const uint8_t *buffer, int buflen);
-#endif
 
 /****************************************************************************
  * Name: i2c_read
@@ -367,10 +361,8 @@ int i2c_write(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *confi
  *
  ****************************************************************************/
 
-#ifdef CONFIG_I2C_TRANSFER
 int i2c_read(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
              FAR uint8_t *buffer, int buflen);
-#endif
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/include/nuttx/input/mxt.h b/include/nuttx/input/mxt.h
index 4498be11c22..22ee792769c 100644
--- a/include/nuttx/input/mxt.h
+++ b/include/nuttx/input/mxt.h
@@ -87,10 +87,6 @@
  * in getting the right configuration.
  */
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error "CONFIG_I2C_TRANSFER is required in the I2C configuration"
-#endif
-
 #ifdef CONFIG_DISABLE_SIGNALS
 #  error "Signals are required.  CONFIG_DISABLE_SIGNALS must not be selected."
 #endif
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index 6cf96e6a7fd..0ace9ea3131 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -121,9 +121,6 @@
 #  ifndef CONFIG_I2C
 #    error "CONFIG_I2C is required in the I2C support"
 #  endif
-#  ifndef CONFIG_I2C_TRANSFER
-#    error "CONFIG_I2C_TRANSFER is required in the I2C configuration"
-#  endif
 #endif
 
 #ifdef CONFIG_DISABLE_SIGNALS
diff --git a/include/nuttx/input/tsc2007.h b/include/nuttx/input/tsc2007.h
index 1517fd488a5..20a832f8707 100644
--- a/include/nuttx/input/tsc2007.h
+++ b/include/nuttx/input/tsc2007.h
@@ -69,10 +69,6 @@
  * in getting the right configuration.
  */
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error "CONFIG_I2C_TRANSFER is required in the I2C configuration"
-#endif
-
 #ifdef CONFIG_DISABLE_SIGNALS
 #  error "Signals are required.  CONFIG_DISABLE_SIGNALS must not be selected."
 #endif
diff --git a/include/nuttx/lcd/ssd1306.h b/include/nuttx/lcd/ssd1306.h
index 286c573e3af..ed4195e78b8 100644
--- a/include/nuttx/lcd/ssd1306.h
+++ b/include/nuttx/lcd/ssd1306.h
@@ -118,10 +118,6 @@
 
 #ifdef CONFIG_LCD_SSD1306_I2C
 
-#ifndef CONFIG_I2C_TRANSFER
-#  error "CONFIG_I2C_TRANSFER must be defined in your NuttX configuration"
-#endif
-
 #ifndef CONFIG_SSD1306_I2CADDR
 #  define CONFIG_SSD1306_I2CADDR 0x78 /* 120 in decimal */
 #endif
diff --git a/include/nuttx/sensors/adxl345.h b/include/nuttx/sensors/adxl345.h
index 23409efe805..da563c8ac60 100644
--- a/include/nuttx/sensors/adxl345.h
+++ b/include/nuttx/sensors/adxl345.h
@@ -97,9 +97,6 @@
 #  ifndef CONFIG_I2C
 #    error "CONFIG_I2C is required in the I2C support"
 #  endif
-#  ifndef CONFIG_I2C_TRANSFER
-#    error "CONFIG_I2C_TRANSFER is required in the I2C configuration"
-#  endif
 #endif
 
 /* I2C **************************************************************************************/
diff --git a/include/nuttx/sensors/lis331dl.h b/include/nuttx/sensors/lis331dl.h
index db4c4317d99..8d69b5d7c35 100644
--- a/include/nuttx/sensors/lis331dl.h
+++ b/include/nuttx/sensors/lis331dl.h
@@ -41,7 +41,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_I2C_TRANSFER) && defined(CONFIG_LIS331DL)
+#if defined(CONFIG_I2C) && defined(CONFIG_LIS331DL)
 
 /************************************************************************************
  * Pre-Processor Declarations
@@ -208,5 +208,5 @@ FAR const struct lis331dl_vector_s *
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* CONFIG_I2C && CONFIG_I2C_TRANSFER && CONFIG_LIS331DL */
+#endif /* CONFIG_I2C && CONFIG_LIS331DL */
 #endif /* __INCLUDE_NUTTX_SENSORS_LIS331DL_H */
diff --git a/include/nuttx/timers/cs2100-cp.h b/include/nuttx/timers/cs2100-cp.h
index dcff2851e06..5d62149134c 100644
--- a/include/nuttx/timers/cs2100-cp.h
+++ b/include/nuttx/timers/cs2100-cp.h
@@ -54,10 +54,6 @@
 
 #ifndef CONFIG_I2C
 #  error I2C driver support is required (CONFIG_I2C)
-#else
-#  ifndef CONFIG_I2C_TRANSFER
-#    error I2C transfer method is required (CONFIG_I2C_TRANSFER)
-#  endif
 #endif
 
 #ifndef CONFIG_TIMERS_CS2100CP_CLKINBW