diff --git a/arch b/arch
index 69b5f95ae5c..ce5362e2daf 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 69b5f95ae5c4b953be4b6e1598a4e71f794afe52
+Subproject commit ce5362e2daf21444768b5219eb0eca6fa7929ea1
diff --git a/configs b/configs
index f4d2471e106..6b24789ace5 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit f4d2471e1064a8c1dacfd3368aaa9229cc065274
+Subproject commit 6b24789ace585ef78778cff3a3c894ad11db6166
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 41123641ebc..bef5458d4a5 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -268,7 +268,7 @@ menuconfig I2C
 	default n
 	---help---
 		This selection enables building of the "upper-half" I2C driver.
-		See include/nuttx/i2c.h for further I2C driver information.
+		See include/nuttx/i2c/i2c_master.h for further I2C driver information.
 
 if I2C
 source drivers/i2c/Kconfig
diff --git a/drivers/README.txt b/drivers/README.txt
index 6f731a153f9..420988ccd48 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -69,7 +69,7 @@ eeprom/
   the EEPROM drivers.
 
 i2c/
-  I2C drivers and support logic.  See include/nuttx/i2c.h
+  I2C drivers and support logic.  See include/nuttx/i2c/i2c_master.h
 
 input/
   This directory holds implementations of human input device (HID)
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index ac3bdf36681..a240aa7703e 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -62,7 +62,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/audio/i2s.h>
diff --git a/drivers/i2c/i2c_read.c b/drivers/i2c/i2c_read.c
index 2c93bac5338..04052c44478 100644
--- a/drivers/i2c/i2c_read.c
+++ b/drivers/i2c/i2c_read.c
@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_I2C_TRANSFER)
 
diff --git a/drivers/i2c/i2c_write.c b/drivers/i2c/i2c_write.c
index 3f2395e370d..d8eceb610cc 100644
--- a/drivers/i2c/i2c_write.c
+++ b/drivers/i2c/i2c_write.c
@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_I2C_TRANSFER)
 
diff --git a/drivers/i2c/i2c_writeread.c b/drivers/i2c/i2c_writeread.c
index d5fab3f43b0..cfb9a127cbf 100644
--- a/drivers/i2c/i2c_writeread.c
+++ b/drivers/i2c/i2c_writeread.c
@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_I2C_TRANSFER)
 
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 6a1ebeceb66..0d89a1abfbf 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -61,7 +61,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/wqueue.h>
 
 #include <nuttx/input/touchscreen.h>
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 723d12c92f0..fa701e0710f 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -60,7 +60,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/wqueue.h>
 
 #include <nuttx/arch.h>
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 8f6a6930af7..31d17a031a2 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -65,7 +65,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/wqueue.h>
 
 #include <nuttx/input/touchscreen.h>
diff --git a/drivers/ioexpander/pca9555.c b/drivers/ioexpander/pca9555.c
index 9f3fe58ebfb..91a2f3e2239 100644
--- a/drivers/ioexpander/pca9555.c
+++ b/drivers/ioexpander/pca9555.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/ioexpander/ioexpander.h>
 
diff --git a/drivers/ioexpander/pca9555.h b/drivers/ioexpander/pca9555.h
index 258cf0e6401..0eb07101eca 100644
--- a/drivers/ioexpander/pca9555.h
+++ b/drivers/ioexpander/pca9555.h
@@ -51,7 +51,7 @@
 #include <nuttx/ioexpander/ioexpander.h>
 #include <nuttx/ioexpander/pca9555.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/irq.h>
 
 #if defined(CONFIG_IOEXPANDER) && defined(CONFIG_IOEXPANDER_PCA9555)
diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c
index 2ac7bbeca1c..b7d76eb9ec8 100644
--- a/drivers/lcd/ssd1306_base.c
+++ b/drivers/lcd/ssd1306_base.c
@@ -129,7 +129,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1306.h>
diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c
index 7164d890bef..ffc72b075ef 100644
--- a/drivers/lcd/ssd1306_i2c.c
+++ b/drivers/lcd/ssd1306_i2c.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/lcd/ssd1306.h>
 
 #include "ssd1306.h"
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index fc0d413c34e..92f8baaa941 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/leds/pca9635pw.h>
 
diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c
index 9ce0ee31c81..8f76e54f65c 100644
--- a/drivers/mtd/at24xx.c
+++ b/drivers/mtd/at24xx.c
@@ -59,7 +59,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/mtd/mtd.h>
 
 #ifdef CONFIG_MTD_AT24XX
diff --git a/drivers/power/bq2425x.c b/drivers/power/bq2425x.c
index c4d281c392f..bf9d3e86da4 100644
--- a/drivers/power/bq2425x.c
+++ b/drivers/power/bq2425x.c
@@ -53,7 +53,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/power/battery_charger.h>
 #include <nuttx/power/battery_ioctl.h>
 #include "bq2425x.h"
diff --git a/drivers/power/max1704x.c b/drivers/power/max1704x.c
index 571fe63c3ef..73fd5b38ca8 100644
--- a/drivers/power/max1704x.c
+++ b/drivers/power/max1704x.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/power/battery_gauge.h>
 
 /* This driver requires:
diff --git a/drivers/sensors/adxl345_i2c.c b/drivers/sensors/adxl345_i2c.c
index 9b905b7b970..b5ece687272 100644
--- a/drivers/sensors/adxl345_i2c.c
+++ b/drivers/sensors/adxl345_i2c.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/adxl345.h>
 
 #include "adxl345.h"
diff --git a/drivers/sensors/as5048b.c b/drivers/sensors/as5048b.c
index e33ea6e0383..cd56af85a14 100644
--- a/drivers/sensors/as5048b.c
+++ b/drivers/sensors/as5048b.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/as5048b.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_QENCODER) && defined(CONFIG_AS5048B)
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index c379b5707aa..8ffc326c264 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/bmp180.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_BMP180)
diff --git a/drivers/sensors/lis331dl.c b/drivers/sensors/lis331dl.c
index aad762c8ec0..4087579fd6f 100644
--- a/drivers/sensors/lis331dl.c
+++ b/drivers/sensors/lis331dl.c
@@ -46,7 +46,7 @@
 #include <stdio.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lis331dl.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_I2C_TRANSFER) && defined(CONFIG_LIS331DL)
diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c
index e1a43539e8b..05f6f890efb 100644
--- a/drivers/sensors/lm75.c
+++ b/drivers/sensors/lm75.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lm75.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75)
diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c
index 02ed18196bf..31593337214 100644
--- a/drivers/sensors/lm92.c
+++ b/drivers/sensors/lm92.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lm92.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_LM92)
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index ba6e07784bf..047591052a1 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lsm9ds1.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_SN_LSM9DS1)
diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c
index 16c853421a3..22ed726eae8 100644
--- a/drivers/sensors/mb7040.c
+++ b/drivers/sensors/mb7040.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/mb7040.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_MB7040)
diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c
index 68a5091ce3b..92f738d6fb5 100644
--- a/drivers/sensors/mcp9844.c
+++ b/drivers/sensors/mcp9844.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/mcp9844.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_MCP9844)
diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c
index ad01b23b84e..58d9ec8b32f 100644
--- a/drivers/sensors/ms58xx.c
+++ b/drivers/sensors/ms58xx.c
@@ -48,7 +48,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/ms58xx.h>
 
 #if defined(CONFIG_I2C) && defined(CONFIG_MS58XX)
diff --git a/drivers/timers/cs2100-cp.c b/drivers/timers/cs2100-cp.c
index f8064db33f0..10da98d4b31 100644
--- a/drivers/timers/cs2100-cp.c
+++ b/drivers/timers/cs2100-cp.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/timers/cs2100-cp.h>
 
 #ifdef CONFIG_TIMERS_CS2100CP
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index 18a60c1b623..aede53b9d2a 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/timers/ds3231.h>
 
 #include "ds3231.h"
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index 6081d880188..5d50240f7b9 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/timers/pcf85263.h>
 
 #include "pcf85263.h"
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index e0fe18d21f4..58b38f974f4 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -53,7 +53,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/video/ov2640.h>
 
 /****************************************************************************
diff --git a/include/nuttx/audio/wm8904.h b/include/nuttx/audio/wm8904.h
index 6536d778905..983a205e3da 100644
--- a/include/nuttx/audio/wm8904.h
+++ b/include/nuttx/audio/wm8904.h
@@ -214,7 +214,7 @@ extern "C"
  *
  ****************************************************************************/
 
-struct i2c_dev_s;         /* Forward reference. Defined in include/nuttx/i2c.h */
+struct i2c_dev_s;         /* Forward reference. Defined in include/nuttx/i2c/i2c_master.h */
 struct i2s_dev_s;         /* Forward reference. Defined in include/nuttx/audio/i2s.h */
 struct audio_lowerhalf_s; /* Forward reference. Defined in nuttx/audio/audio.h */
 
diff --git a/include/nuttx/i2c.h b/include/nuttx/i2c/i2c_master.h
similarity index 98%
rename from include/nuttx/i2c.h
rename to include/nuttx/i2c/i2c_master.h
index 03c03bced6c..2216026340b 100644
--- a/include/nuttx/i2c.h
+++ b/include/nuttx/i2c/i2c_master.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/i2c.h
+ * include/nuttx/i2c/i2c_master.h
  *
  *   Copyright(C) 2009-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_I2C_H
-#define __INCLUDE_NUTTX_I2C_H
+#ifndef __INCLUDE_NUTTX_I2C_I2C_MASTER_H
+#define __INCLUDE_NUTTX_I2C_I2C_MASTER_H
 
 /****************************************************************************
  * Included Files
@@ -417,4 +417,4 @@ int i2c_read(FAR struct i2c_dev_s *dev, FAR const struct i2c_config_s *config,
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __INCLUDE_NUTTX_I2C_H */
+#endif /* __INCLUDE_NUTTX_I2C_I2C_MASTER_H */
diff --git a/include/nuttx/input/ads7843e.h b/include/nuttx/input/ads7843e.h
index 4c4b3b11891..3b14507228f 100644
--- a/include/nuttx/input/ads7843e.h
+++ b/include/nuttx/input/ads7843e.h
@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)
 
diff --git a/include/nuttx/input/mxt.h b/include/nuttx/input/mxt.h
index fb606c1d789..aecc042c336 100644
--- a/include/nuttx/input/mxt.h
+++ b/include/nuttx/input/mxt.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_MXT)
 
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index 7b11496cc0a..4c64b4005db 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -46,7 +46,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/spi/spi.h>
 
 #include <nuttx/irq.h>
diff --git a/include/nuttx/input/tsc2007.h b/include/nuttx/input/tsc2007.h
index 7ca219cd9ae..468878f8307 100644
--- a/include/nuttx/input/tsc2007.h
+++ b/include/nuttx/input/tsc2007.h
@@ -51,7 +51,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_TSC2007)
 
diff --git a/include/nuttx/ioexpander/pca9555.h b/include/nuttx/ioexpander/pca9555.h
index 581528c531f..2a0e4200d1f 100644
--- a/include/nuttx/ioexpander/pca9555.h
+++ b/include/nuttx/ioexpander/pca9555.h
@@ -40,7 +40,7 @@
 #ifndef __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
 #define __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 /* A reference to a structure of this type must be passed to the PCA9555 driver when the
  * driver is instantiated. This structure provides information about the configuration of
diff --git a/include/nuttx/timers/cs2100-cp.h b/include/nuttx/timers/cs2100-cp.h
index 9947f99d861..8ef8bb726c5 100644
--- a/include/nuttx/timers/cs2100-cp.h
+++ b/include/nuttx/timers/cs2100-cp.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #ifdef CONFIG_TIMERS_CS2100CP