From 8f692c7d38e61416d4fa1bcf32b04cae32ac29e0 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 25 Jun 2019 15:53:54 -0400
Subject: [PATCH] cleanup: include/: move i2c.h to drivers/i2c.h

move i2c.h to drivers/i2c.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 boards/x86/galileo/pinmux.c                   |    2 +-
 drivers/audio/tlv320dac310x.c                 |    2 +-
 drivers/crypto/crypto_ataes132a.c             |    2 +-
 drivers/crypto/crypto_ataes132a_priv.h        |    2 +-
 drivers/display/grove_lcd_rgb.c               |    2 +-
 drivers/display/ssd1306.c                     |    2 +-
 drivers/ethernet/eth_sam_gmac.c               |    2 +-
 drivers/gpio/gpio_pcal9535a.c                 |    2 +-
 drivers/gpio/gpio_pcal9535a.h                 |    2 +-
 drivers/gpio/gpio_sx1509b.c                   |    2 +-
 drivers/i2c/i2c-priv.h                        |    2 +-
 drivers/i2c/i2c_bitbang.c                     |    2 +-
 drivers/i2c/i2c_cc13xx_cc26xx.c               |    2 +-
 drivers/i2c/i2c_cc32xx.c                      |    2 +-
 drivers/i2c/i2c_dw.c                          |    2 +-
 drivers/i2c/i2c_dw.h                          |    2 +-
 drivers/i2c/i2c_esp32.c                       |    2 +-
 drivers/i2c/i2c_gecko.c                       |    2 +-
 drivers/i2c/i2c_gpio.c                        |    2 +-
 drivers/i2c/i2c_handlers.c                    |    2 +-
 drivers/i2c/i2c_imx.c                         |    2 +-
 drivers/i2c/i2c_ll_stm32.c                    |    2 +-
 drivers/i2c/i2c_ll_stm32_v1.c                 |    2 +-
 drivers/i2c/i2c_ll_stm32_v2.c                 |    2 +-
 drivers/i2c/i2c_mchp_xec.c                    |    2 +-
 drivers/i2c/i2c_mcux.c                        |    2 +-
 drivers/i2c/i2c_mcux_lpi2c.c                  |    2 +-
 drivers/i2c/i2c_nios2.c                       |    2 +-
 drivers/i2c/i2c_nrfx_twi.c                    |    2 +-
 drivers/i2c/i2c_nrfx_twim.c                   |    2 +-
 drivers/i2c/i2c_qmsi.c                        |    2 +-
 drivers/i2c/i2c_qmsi_ss.c                     |    2 +-
 drivers/i2c/i2c_rv32m1_lpi2c.c                |    2 +-
 drivers/i2c/i2c_sam0.c                        |    2 +-
 drivers/i2c/i2c_sam_twi.c                     |    2 +-
 drivers/i2c/i2c_sam_twihs.c                   |    2 +-
 drivers/i2c/i2c_sbcon.c                       |    2 +-
 drivers/i2c/i2c_sifive.c                      |    2 +-
 drivers/i2c/slave/eeprom_slave.c              |    2 +-
 drivers/led/ht16k33.c                         |    2 +-
 drivers/led/lp3943.c                          |    2 +-
 drivers/led/lp5562.c                          |    2 +-
 drivers/led/pca9633.c                         |    2 +-
 drivers/pwm/pwm_pca9685.c                     |    2 +-
 drivers/pwm/pwm_pca9685.h                     |    2 +-
 drivers/sensor/adt7420/adt7420.c              |    2 +-
 drivers/sensor/adt7420/adt7420_trigger.c      |    2 +-
 drivers/sensor/adxl372/adxl372.c              |    2 +-
 drivers/sensor/adxl372/adxl372.h              |    2 +-
 drivers/sensor/ak8975/ak8975.c                |    2 +-
 drivers/sensor/amg88xx/amg88xx.c              |    2 +-
 drivers/sensor/amg88xx/amg88xx_trigger.c      |    2 +-
 drivers/sensor/ams_iAQcore/iAQcore.c          |    2 +-
 drivers/sensor/apds9960/apds9960.c            |    2 +-
 drivers/sensor/apds9960/apds9960_trigger.c    |    2 +-
 drivers/sensor/bma280/bma280.c                |    2 +-
 drivers/sensor/bma280/bma280_trigger.c        |    2 +-
 drivers/sensor/bmc150_magn/bmc150_magn.h      |    2 +-
 drivers/sensor/bme280/bme280.c                |    2 +-
 drivers/sensor/bme680/bme680.c                |    2 +-
 drivers/sensor/bmg160/bmg160.h                |    2 +-
 drivers/sensor/bmm150/bmm150.h                |    2 +-
 drivers/sensor/ccs811/ccs811.c                |    2 +-
 drivers/sensor/ens210/ens210.c                |    2 +-
 drivers/sensor/fxas21002/fxas21002.h          |    2 +-
 drivers/sensor/fxos8700/fxos8700.h            |    2 +-
 drivers/sensor/hmc5883l/hmc5883l.c            |    2 +-
 drivers/sensor/hmc5883l/hmc5883l_trigger.c    |    2 +-
 drivers/sensor/hp206c/hp206c.c                |    2 +-
 drivers/sensor/hts221/hts221.c                |    2 +-
 drivers/sensor/hts221/hts221_trigger.c        |    2 +-
 drivers/sensor/isl29035/isl29035.c            |    2 +-
 drivers/sensor/isl29035/isl29035_trigger.c    |    2 +-
 drivers/sensor/lis2dh/lis2dh.h                |    2 +-
 drivers/sensor/lis2ds12/lis2ds12_i2c.c        |    2 +-
 drivers/sensor/lis2ds12/lis2ds12_trigger.c    |    2 +-
 drivers/sensor/lis2dw12/lis2dw12.c            |    2 +-
 drivers/sensor/lis2dw12/lis2dw12_i2c.c        |    2 +-
 drivers/sensor/lis2mdl/lis2mdl.h              |    2 +-
 drivers/sensor/lis3mdl/lis3mdl.c              |    2 +-
 drivers/sensor/lis3mdl/lis3mdl_trigger.c      |    2 +-
 drivers/sensor/lps22hb/lps22hb.h              |    2 +-
 drivers/sensor/lps25hb/lps25hb.h              |    2 +-
 .../sensor/lsm303dlhc_magn/lsm303dlhc_magn.c  |    2 +-
 drivers/sensor/lsm6ds0/lsm6ds0.h              |    2 +-
 drivers/sensor/lsm6dsl/lsm6dsl_i2c.c          |    2 +-
 drivers/sensor/lsm6dsl/lsm6dsl_shub.c         |    2 +-
 drivers/sensor/lsm6dsl/lsm6dsl_trigger.c      |    2 +-
 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h    |    2 +-
 .../lsm9ds0_gyro/lsm9ds0_gyro_trigger.c       |    2 +-
 drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c      |    2 +-
 drivers/sensor/max30101/max30101.h            |    2 +-
 drivers/sensor/max44009/max44009.c            |    2 +-
 drivers/sensor/mcp9808/mcp9808.c              |    2 +-
 drivers/sensor/mcp9808/mcp9808_trigger.c      |    2 +-
 drivers/sensor/mpu6050/mpu6050.c              |    2 +-
 drivers/sensor/mpu6050/mpu6050_trigger.c      |    2 +-
 drivers/sensor/ms5837/ms5837.h                |    2 +-
 drivers/sensor/sht3xd/sht3xd.c                |    2 +-
 drivers/sensor/sx9500/sx9500.c                |    2 +-
 drivers/sensor/sx9500/sx9500_trigger.c        |    2 +-
 drivers/sensor/th02/th02.c                    |    2 +-
 drivers/sensor/ti_hdc/ti_hdc.c                |    2 +-
 drivers/sensor/tmp007/tmp007.c                |    2 +-
 drivers/sensor/tmp112/tmp112.c                |    2 +-
 drivers/sensor/vl53l0x/vl53l0x.c              |    2 +-
 drivers/sensor/vl53l0x/vl53l0x_platform.c     |    2 +-
 include/drivers/i2c.h                         | 1040 +++++++++++++++++
 include/i2c.h                                 | 1033 +---------------
 .../boards/96b_argonkey/sensors/src/main.c    |    2 +-
 samples/display/grove_display/src/main.c      |    2 +-
 samples/drivers/current_sensing/src/main.c    |    2 +-
 samples/drivers/i2c_fujitsu_fram/src/main.c   |    2 +-
 samples/drivers/i2c_scanner/src/main.c        |    2 +-
 samples/sensor/bmg160/src/main.c              |    2 +-
 .../altera_max10/i2c_master/src/i2c_master.c  |    2 +-
 tests/boards/intel_s1000_crb/src/i2c_test.c   |    2 +-
 tests/drivers/i2c/i2c_api/src/test_i2c.c      |    2 +-
 .../i2c/i2c_slave_api/common/i2c_virtual.c    |    2 +-
 tests/drivers/i2c/i2c_slave_api/src/main.c    |    2 +-
 120 files changed, 1162 insertions(+), 1147 deletions(-)
 create mode 100644 include/drivers/i2c.h

diff --git a/boards/x86/galileo/pinmux.c b/boards/x86/galileo/pinmux.c
index 4c73b067be6..7e4e3163f3f 100644
--- a/boards/x86/galileo/pinmux.c
+++ b/boards/x86/galileo/pinmux.c
@@ -12,7 +12,7 @@
 #include <init.h>
 
 #include <pinmux.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <pwm.h>
 
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index 76e84e00ca8..67b67ab1c9a 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -9,7 +9,7 @@
 #include <misc/util.h>
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 
 #include <audio/codec.h>
diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c
index b314969154b..4e923c4e438 100644
--- a/drivers/crypto/crypto_ataes132a.c
+++ b/drivers/crypto/crypto_ataes132a.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <string.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <assert.h>
 #include <crypto/cipher.h>
 
diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h
index bc01116e17b..e62d7aa30f2 100644
--- a/drivers/crypto/crypto_ataes132a_priv.h
+++ b/drivers/crypto/crypto_ataes132a_priv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
 #define ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <misc/util.h>
 
diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c
index 98b7b221bef..b28e4abaa52 100644
--- a/drivers/display/grove_lcd_rgb.c
+++ b/drivers/display/grove_lcd_rgb.c
@@ -9,7 +9,7 @@
 #include <init.h>
 #include <stdbool.h>
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <display/grove_lcd.h>
 #include <misc/util.h>
 
diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c
index 647f12d836f..a0055600cce 100644
--- a/drivers/display/ssd1306.c
+++ b/drivers/display/ssd1306.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(ssd1306);
 #include <device.h>
 #include <init.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #include "ssd1306_regs.h"
 #include <display/cfb.h>
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
index a3fbd54dc90..a91e2f0141f 100644
--- a/drivers/ethernet/eth_sam_gmac.c
+++ b/drivers/ethernet/eth_sam_gmac.c
@@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <net/net_if.h>
 #include <net/ethernet.h>
 #include <ethernet/eth_stats.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 #include "phy_sam_gmac.h"
 #include "eth_sam_gmac_priv.h"
diff --git a/drivers/gpio/gpio_pcal9535a.c b/drivers/gpio/gpio_pcal9535a.c
index e2fbc14f0cc..8ed265c322d 100644
--- a/drivers/gpio/gpio_pcal9535a.c
+++ b/drivers/gpio/gpio_pcal9535a.c
@@ -15,7 +15,7 @@
 #include <init.h>
 #include <misc/util.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #include "gpio_pcal9535a.h"
 
diff --git a/drivers/gpio/gpio_pcal9535a.h b/drivers/gpio/gpio_pcal9535a.h
index 84dc67518f2..1186ccefacd 100644
--- a/drivers/gpio/gpio_pcal9535a.h
+++ b/drivers/gpio/gpio_pcal9535a.h
@@ -14,7 +14,7 @@
 #include <kernel.h>
 
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index bc7484c442f..843fef888c6 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <init.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 
diff --git a/drivers/i2c/i2c-priv.h b/drivers/i2c/i2c-priv.h
index d021ff687f3..294312c1c2f 100644
--- a/drivers/i2c/i2c-priv.h
+++ b/drivers/i2c/i2c-priv.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <dt-bindings/i2c/i2c.h>
 #include <logging/log.h>
 
diff --git a/drivers/i2c/i2c_bitbang.c b/drivers/i2c/i2c_bitbang.c
index 553c3d8dbda..5c074498b4b 100644
--- a/drivers/i2c/i2c_bitbang.c
+++ b/drivers/i2c/i2c_bitbang.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 /*
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index 88c54ad3470..cdded5ec278 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -5,7 +5,7 @@
  */
 
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index 98990dfba25..f7a17ba2753 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -8,7 +8,7 @@
 
 #include <kernel.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 
 /* Driverlib includes */
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index ef6a98456aa..dffc70376d2 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <init.h>
 #include <arch/cpu.h>
diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h
index 807f1a9466b..2cea9e7662c 100644
--- a/drivers/i2c/i2c_dw.h
+++ b/drivers/i2c/i2c_dw.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_I2C_I2C_DW_H_
 #define ZEPHYR_DRIVERS_I2C_I2C_DW_H_
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <stdbool.h>
 
 #if DT_INST_0_SNPS_DESIGNWARE_I2C_PCIE || \
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index 444cadf310d..5afdcd92dc5 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <drivers/gpio.h>
 #include <gpio/gpio_esp32.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <string.h>
 
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index a06d4e0d958..3f26b843a58 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <em_cmu.h>
 #include <em_i2c.h>
diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c
index 1aaec401f02..5ff62eedeed 100644
--- a/drivers/i2c/i2c_gpio.c
+++ b/drivers/i2c/i2c_gpio.c
@@ -23,7 +23,7 @@
 #include <device.h>
 #include <errno.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 /* Driver config */
diff --git a/drivers/i2c/i2c_handlers.c b/drivers/i2c/i2c_handlers.c
index d754a2648cf..4d9d50fc61a 100644
--- a/drivers/i2c/i2c_handlers.c
+++ b/drivers/i2c/i2c_handlers.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <string.h>
 #include <syscall_handler.h>
 
diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c
index 6f439298852..f8bdd684a1a 100644
--- a/drivers/i2c/i2c_imx.c
+++ b/drivers/i2c/i2c_imx.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 #include <i2c_imx.h>
 #include <misc/util.h>
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index abb954fae44..edab21d6d0d 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -11,7 +11,7 @@
 #include <kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index cea35ee2e45..5896dad7832 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -14,7 +14,7 @@
 #include <kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index ce8336a6214..997498ab05b 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -14,7 +14,7 @@
 #include <kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c
index 8f7d2352ba5..8617eab84e3 100644
--- a/drivers/i2c/i2c_mchp_xec.c
+++ b/drivers/i2c/i2c_mchp_xec.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define SPEED_100KHZ_BUS    0
 #define SPEED_400KHZ_BUS    1
diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c
index c6ee5a7a013..35f4700f513 100644
--- a/drivers/i2c/i2c_mcux.c
+++ b/drivers/i2c/i2c_mcux.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 #include <fsl_i2c.h>
 #include <fsl_clock.h>
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
index 1f5a3c0a03b..beca5623b62 100644
--- a/drivers/i2c/i2c_mcux_lpi2c.c
+++ b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -6,7 +6,7 @@
  */
 
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/clock_control.h>
 #include <fsl_lpi2c.h>
 
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 1536cb7a371..64a0672a617 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 #include <misc/util.h>
 #include <altera_common.h>
diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c
index 5fdebd3c571..08aee9d34dd 100644
--- a/drivers/i2c/i2c_nrfx_twi.c
+++ b/drivers/i2c/i2c_nrfx_twi.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <dt-bindings/i2c/i2c.h>
 #include <nrfx_twi.h>
 
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 14c2c5def92..c687f1fd48c 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <dt-bindings/i2c/i2c.h>
 #include <nrfx_twim.h>
 
diff --git a/drivers/i2c/i2c_qmsi.c b/drivers/i2c/i2c_qmsi.c
index 740c1495ada..47f6b1e0052 100644
--- a/drivers/i2c/i2c_qmsi.c
+++ b/drivers/i2c/i2c_qmsi.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/interrupt_controller/ioapic.h>
 #include <power/power.h>
 
diff --git a/drivers/i2c/i2c_qmsi_ss.c b/drivers/i2c/i2c_qmsi_ss.c
index db635ddd4b9..956178adbb4 100644
--- a/drivers/i2c/i2c_qmsi_ss.c
+++ b/drivers/i2c/i2c_qmsi_ss.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <soc.h>
 
 #include "qm_ss_i2c.h"
diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
index 141098ca2ca..8e829303842 100644
--- a/drivers/i2c/i2c_rv32m1_lpi2c.c
+++ b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/clock_control.h>
 #include <fsl_lpi2c.h>
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c
index 6b13e27b66a..b1cb61df6cc 100644
--- a/drivers/i2c/i2c_sam0.c
+++ b/drivers/i2c/i2c_sam0.c
@@ -9,7 +9,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/dma.h>
 
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index 021b286de1c..aee23b015ea 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -19,7 +19,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index 21a0c834818..96c5ad4e3d8 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -17,7 +17,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c
index b4360543a5a..43c39343c2b 100644
--- a/drivers/i2c/i2c_sbcon.c
+++ b/drivers/i2c/i2c_sbcon.c
@@ -14,7 +14,7 @@
 
 #include <device.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 /* SBCon hardware registers layout */
diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c
index 1c570761d0d..3726345dcce 100644
--- a/drivers/i2c/i2c_sifive.c
+++ b/drivers/i2c/i2c_sifive.c
@@ -9,7 +9,7 @@
 LOG_MODULE_REGISTER(i2c_sifive);
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sys/sys_io.h>
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c
index b15122d411c..15a263c729c 100644
--- a/drivers/i2c/slave/eeprom_slave.c
+++ b/drivers/i2c/slave/eeprom_slave.c
@@ -7,7 +7,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <string.h>
 #include <drivers/i2c/slave/eeprom.h>
 
diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
index 5e727098dcb..3c630a90b58 100644
--- a/drivers/led/ht16k33.c
+++ b/drivers/led/ht16k33.c
@@ -10,7 +10,7 @@
  */
 
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <led.h>
 #include <misc/byteorder.h>
diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c
index d1c2d0210bd..b26932e39f9 100644
--- a/drivers/led/lp3943.c
+++ b/drivers/led/lp3943.c
@@ -17,7 +17,7 @@
  *   values for a LED will affect other LEDs also.
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <led.h>
 #include <misc/util.h>
 #include <zephyr.h>
diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c
index 26fff05bf2b..c773a053fa1 100644
--- a/drivers/led/lp5562.c
+++ b/drivers/led/lp5562.c
@@ -28,7 +28,7 @@
  * communication between the host MCU and the driver.
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <led.h>
 #include <device.h>
 #include <zephyr.h>
diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c
index fb3d302fa33..39af39b4ca5 100644
--- a/drivers/led/pca9633.c
+++ b/drivers/led/pca9633.c
@@ -9,7 +9,7 @@
  * @brief LED driver for the PCA9633 I2C LED driver (7-bit slave address 0x62)
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <led.h>
 #include <misc/util.h>
 #include <zephyr.h>
diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c
index 058eb256b03..de052aae667 100644
--- a/drivers/pwm/pwm_pca9685.c
+++ b/drivers/pwm/pwm_pca9685.c
@@ -12,7 +12,7 @@
 
 #include <kernel.h>
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <pwm.h>
 
 #include "pwm_pca9685.h"
diff --git a/drivers/pwm/pwm_pca9685.h b/drivers/pwm/pwm_pca9685.h
index e79577717ba..d3eb15ec0b7 100644
--- a/drivers/pwm/pwm_pca9685.h
+++ b/drivers/pwm/pwm_pca9685.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_
 
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c
index e20210d3cd3..e87c6207eb0 100644
--- a/drivers/sensor/adt7420/adt7420.c
+++ b/drivers/sensor/adt7420/adt7420.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c
index 9876e1195fe..4d9412d875e 100644
--- a/drivers/sensor/adt7420/adt7420_trigger.c
+++ b/drivers/sensor/adt7420/adt7420_trigger.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index 0d1553cdd63..b8db2381225 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -13,7 +13,7 @@
 #include <misc/__assert.h>
 #include <stdlib.h>
 #include <spi.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <logging/log.h>
 
 #include "adxl372.h"
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index 6006c1a02f7..7e0960a1176 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -11,7 +11,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <spi.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 /*
diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c
index 4d3eb3ddf08..c1ade27efcc 100644
--- a/drivers/sensor/ak8975/ak8975.c
+++ b/drivers/sensor/ak8975/ak8975.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <sensor.h>
 #include <misc/__assert.h>
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index 9537330275c..4552969df69 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/drivers/sensor/amg88xx/amg88xx.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c
index e4be3db0885..6e9e91ce46f 100644
--- a/drivers/sensor/amg88xx/amg88xx_trigger.c
+++ b/drivers/sensor/amg88xx/amg88xx_trigger.c
@@ -7,7 +7,7 @@
 
 #include <device.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c
index 35b54d04542..0736c05c8a3 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.c
+++ b/drivers/sensor/ams_iAQcore/iAQcore.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c
index a1f19564262..5dee388e439 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/drivers/sensor/apds9960/apds9960.c
@@ -11,7 +11,7 @@
 
 #include <device.h>
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/byteorder.h>
 #include <init.h>
diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c
index 17c5b4cd178..499923eced3 100644
--- a/drivers/sensor/apds9960/apds9960_trigger.c
+++ b/drivers/sensor/apds9960/apds9960_trigger.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c
index fc861e93aa1..f83cfab92b8 100644
--- a/drivers/sensor/bma280/bma280.c
+++ b/drivers/sensor/bma280/bma280.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <sensor.h>
 #include <misc/__assert.h>
diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c
index 5450cb358e1..4e4406751d5 100644
--- a/drivers/sensor/bma280/bma280_trigger.c
+++ b/drivers/sensor/bma280/bma280_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h
index 15795214750..a70cb19afeb 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.h
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.h
@@ -10,7 +10,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_
 
 #include <zephyr/types.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 #define BMC150_MAGN_REG_CHIP_ID		0x40
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index 658e352e023..ebe8b6137ea 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -15,7 +15,7 @@
 #include <misc/__assert.h>
 
 #ifdef DT_BOSCH_BME280_BUS_I2C
-#include <i2c.h>
+#include <drivers/i2c.h>
 #elif defined DT_BOSCH_BME280_BUS_SPI
 #include <spi.h>
 #endif
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index 88177c02334..ecb90daa841 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/drivers/sensor/bme680/bme680.c
@@ -12,7 +12,7 @@
 
 #include "bme680.h"
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h
index c7e31a73501..85e02d630ca 100644
--- a/drivers/sensor/bmg160/bmg160.h
+++ b/drivers/sensor/bmg160/bmg160.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 #define ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index 1f7000df477..75c3f946bee 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/drivers/sensor/bmm150/bmm150.h
@@ -11,7 +11,7 @@
 
 
 #include <zephyr/types.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <stdint.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index 9170f3d609a..6715356e429 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/drivers/sensor/ccs811/ccs811.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/gpio.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c
index 38179c94c0c..4d88bd95d2b 100644
--- a/drivers/sensor/ens210/ens210.c
+++ b/drivers/sensor/ens210/ens210.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h
index 4170b5183eb..d1cb6263076 100644
--- a/drivers/sensor/fxas21002/fxas21002.h
+++ b/drivers/sensor/fxas21002/fxas21002.h
@@ -5,7 +5,7 @@
  */
 
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 
 #define FXAS21002_REG_STATUS		0x00
diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h
index 507ac24a18d..cc671f39e9f 100644
--- a/drivers/sensor/fxos8700/fxos8700.h
+++ b/drivers/sensor/fxos8700/fxos8700.h
@@ -5,7 +5,7 @@
  */
 
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 
 #define FXOS8700_REG_STATUS			0x00
diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c
index 6d2ea8149af..9b54d7e40e6 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.c
+++ b/drivers/sensor/hmc5883l/hmc5883l.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <misc/__assert.h>
 #include <misc/byteorder.h>
diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
index fcbb320313f..1c6280e7fd0 100644
--- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c
+++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
index 5085b91d4ca..26fdff3ff9a 100644
--- a/drivers/sensor/hp206c/hp206c.c
+++ b/drivers/sensor/hp206c/hp206c.c
@@ -10,7 +10,7 @@
 
 #include <init.h>
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <kernel.h>
 #include <drivers/gpio.h>
diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c
index 11cd65549e7..35b406771c5 100644
--- a/drivers/sensor/hts221/hts221.c
+++ b/drivers/sensor/hts221/hts221.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <misc/__assert.h>
 #include <misc/byteorder.h>
diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c
index d73898245e4..f63f3fa319e 100644
--- a/drivers/sensor/hts221/hts221_trigger.c
+++ b/drivers/sensor/hts221/hts221_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c
index e383ef10538..236d73851e3 100644
--- a/drivers/sensor/isl29035/isl29035.c
+++ b/drivers/sensor/isl29035/isl29035.c
@@ -8,7 +8,7 @@
 
 #include <kernel.h>
 #include <init.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sensor.h>
 #include <misc/__assert.h>
 #include <logging/log.h>
diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c
index dc4e248fabc..7c428dad938 100644
--- a/drivers/sensor/isl29035/isl29035_trigger.c
+++ b/drivers/sensor/isl29035/isl29035_trigger.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 
diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
index ca40c417eac..e3485eb389f 100644
--- a/drivers/sensor/lis2dh/lis2dh.h
+++ b/drivers/sensor/lis2dh/lis2dh.h
@@ -29,7 +29,7 @@
 #define LIS2DH_SPI_CFG			SPI_WORD_SET(8)
 
 #elif defined(DT_ST_LIS2DH_BUS_I2C)
-#include <i2c.h>
+#include <drivers/i2c.h>
 #else
 #error "define bus type (I2C/SPI)"
 #endif
diff --git a/drivers/sensor/lis2ds12/lis2ds12_i2c.c b/drivers/sensor/lis2ds12/lis2ds12_i2c.c
index 58ba124f0ca..87b774ba8de 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_i2c.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_i2c.c
@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <logging/log.h>
 
 #include "lis2ds12.h"
diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
index a2720b74c3d..9b16cc06d63 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
@@ -9,7 +9,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c
index e5570b1ebfd..d8755062635 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.c
+++ b/drivers/sensor/lis2dw12/lis2dw12.c
@@ -17,7 +17,7 @@
 #if defined(DT_ST_LIS2DW12_BUS_SPI)
 #include <spi.h>
 #elif defined(DT_ST_LIS2DW12_BUS_I2C)
-#include <i2c.h>
+#include <drivers/i2c.h>
 #endif
 
 #include "lis2dw12.h"
diff --git a/drivers/sensor/lis2dw12/lis2dw12_i2c.c b/drivers/sensor/lis2dw12/lis2dw12_i2c.c
index b1817139c3b..b59967586c3 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_i2c.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_i2c.c
@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <logging/log.h>
 
 #include "lis2dw12.h"
diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h
index b1bbffe83ac..323affa07e5 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.h
+++ b/drivers/sensor/lis2mdl/lis2mdl.h
@@ -11,7 +11,7 @@
 
 #include <drivers/gpio.h>
 #include <misc/util.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define LIS2MDL_EN_BIT                  1
 #define LIS2MDL_DIS_BIT                 0
diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c
index 4cbb5378ad8..cd6956f154a 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.c
+++ b/drivers/sensor/lis3mdl/lis3mdl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <misc/__assert.h>
 #include <misc/byteorder.h>
diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
index c401cf0c351..ec2324d224e 100644
--- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c
+++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h
index d30b1b10060..85ae8edb69c 100644
--- a/drivers/sensor/lps22hb/lps22hb.h
+++ b/drivers/sensor/lps22hb/lps22hb.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_
 
 #include <stdint.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 #define LPS22HB_REG_WHO_AM_I                    0x0F
diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h
index 70b29fd61e9..ff10ce57560 100644
--- a/drivers/sensor/lps25hb/lps25hb.h
+++ b/drivers/sensor/lps25hb/lps25hb.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_
 
 #include <zephyr/types.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 #define LPS25HB_REG_WHO_AM_I                    0x0F
diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
index 5366843beb2..e3d74ff91ac 100644
--- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
+++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <sensor.h>
 
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h
index f34302b8b80..34cd000024f 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.h
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_
 
 #include <zephyr/types.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 #define LSM6DS0_REG_ACT_THS                     0x04
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
index c9b888ed0fd..38bb1df1849 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <logging/log.h>
 
 #include "lsm6dsl.h"
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
index 6906a81cd16..0d482e281f2 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
index 3e68089398b..c8d476b3129 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
index e370e051af7..55dfb3cc8bd 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
@@ -10,7 +10,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_
 
 #include <zephyr/types.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 
 #define DEG2RAD					0.017453292519943295769236907684
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index 1dba5ad492e..22513db4ea5 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
index 3a60e8da21e..83b0445f266 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
@@ -12,7 +12,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <drivers/gpio.h>
 #include <logging/log.h>
diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h
index c3d19bd011f..f5cbdd90b0e 100644
--- a/drivers/sensor/max30101/max30101.h
+++ b/drivers/sensor/max30101/max30101.h
@@ -5,7 +5,7 @@
  */
 
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 
 #define MAX30101_I2C_ADDRESS		0x57
diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c
index aaab4bf6a7b..4c6616d1e5c 100644
--- a/drivers/sensor/max44009/max44009.c
+++ b/drivers/sensor/max44009/max44009.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sensor.h>
 #include <misc/__assert.h>
 #include <logging/log.h>
diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c
index 309753a0c3a..f6821b333ba 100644
--- a/drivers/sensor/mcp9808/mcp9808.c
+++ b/drivers/sensor/mcp9808/mcp9808.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c
index 98034271ff5..b25316941b6 100644
--- a/drivers/sensor/mcp9808/mcp9808_trigger.c
+++ b/drivers/sensor/mcp9808/mcp9808_trigger.c
@@ -8,7 +8,7 @@
 
 #include <errno.h>
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c
index 0f092fe63a4..e620581ad4b 100644
--- a/drivers/sensor/mpu6050/mpu6050.c
+++ b/drivers/sensor/mpu6050/mpu6050.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <init.h>
 #include <misc/byteorder.h>
 #include <sensor.h>
diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c
index bc67728f0c7..1cb5632f91b 100644
--- a/drivers/sensor/mpu6050/mpu6050_trigger.c
+++ b/drivers/sensor/mpu6050/mpu6050_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/ms5837/ms5837.h b/drivers/sensor/ms5837/ms5837.h
index 9683c6691ff..b42881cfefe 100644
--- a/drivers/sensor/ms5837/ms5837.h
+++ b/drivers/sensor/ms5837/ms5837.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define MS5837_CMD_RESET 0x1E
 
diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c
index c3e10c26f4f..a00e9c83597 100644
--- a/drivers/sensor/sht3xd/sht3xd.c
+++ b/drivers/sensor/sht3xd/sht3xd.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <kernel.h>
 #include <sensor.h>
 #include <misc/__assert.h>
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index 34e8a5e06e8..198d9df5509 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sensor.h>
 #include <init.h>
 #include <drivers/gpio.h>
diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c
index 629273e5616..7741a008375 100644
--- a/drivers/sensor/sx9500/sx9500_trigger.c
+++ b/drivers/sensor/sx9500/sx9500_trigger.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sensor.h>
 #include <drivers/gpio.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c
index d0044dbd722..550b533aec8 100644
--- a/drivers/sensor/th02/th02.c
+++ b/drivers/sensor/th02/th02.c
@@ -6,7 +6,7 @@
 
 #include <kernel.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <sensor.h>
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index a94fccf5125..c9ad45d99da 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/drivers/sensor/ti_hdc/ti_hdc.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index 76a1881c702..47118469665 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/drivers/sensor/tmp007/tmp007.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c
index e8b073f7b0f..73a52aed00d 100644
--- a/drivers/sensor/tmp112/tmp112.c
+++ b/drivers/sensor/tmp112/tmp112.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index f44a25825da..b46735d6ab9 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/drivers/sensor/vl53l0x/vl53l0x.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <sensor.h>
 #include <init.h>
 #include <drivers/gpio.h>
diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.c b/drivers/sensor/vl53l0x/vl53l0x_platform.c
index 93a22bdeeb9..c48ad4175ee 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_platform.c
+++ b/drivers/sensor/vl53l0x/vl53l0x_platform.c
@@ -14,7 +14,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <logging/log.h>
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
diff --git a/include/drivers/i2c.h b/include/drivers/i2c.h
new file mode 100644
index 00000000000..61215696776
--- /dev/null
+++ b/include/drivers/i2c.h
@@ -0,0 +1,1040 @@
+/**
+ * @file
+ *
+ * @brief Public APIs for the I2C drivers.
+ */
+
+/*
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DRIVERS_I2C_H_
+#define ZEPHYR_INCLUDE_DRIVERS_I2C_H_
+
+/**
+ * @brief I2C Interface
+ * @defgroup i2c_interface I2C Interface
+ * @ingroup io_interfaces
+ * @{
+ */
+
+#include <zephyr/types.h>
+#include <device.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The following #defines are used to configure the I2C controller.
+ */
+
+/** I2C Standard Speed */
+#define I2C_SPEED_STANDARD		(0x1U)
+
+/** I2C Fast Speed */
+#define I2C_SPEED_FAST			(0x2U)
+
+/** I2C Fast Plus Speed */
+#define I2C_SPEED_FAST_PLUS		(0x3U)
+
+/** I2C High Speed */
+#define I2C_SPEED_HIGH			(0x4U)
+
+/** I2C Ultra Fast Speed */
+#define I2C_SPEED_ULTRA			(0x5U)
+
+#define I2C_SPEED_SHIFT			(1U)
+#define I2C_SPEED_SET(speed)		(((speed) << I2C_SPEED_SHIFT) \
+						& I2C_SPEED_MASK)
+#define I2C_SPEED_MASK			(0x7U << I2C_SPEED_SHIFT) /* 3 bits */
+#define I2C_SPEED_GET(cfg) 		(((cfg) & I2C_SPEED_MASK) \
+						>> I2C_SPEED_SHIFT)
+
+/** Use 10-bit addressing. DEPRECATED - Use I2C_MSG_ADDR_10_BITS instead. */
+#define I2C_ADDR_10_BITS		BIT(0)
+
+/** Controller to act as Master. */
+#define I2C_MODE_MASTER			BIT(4)
+
+/*
+ * The following #defines are used to configure the I2C slave device
+ */
+
+/** Slave device responds to 10-bit addressing. */
+#define I2C_SLAVE_FLAGS_ADDR_10_BITS	BIT(0)
+
+/*
+ * I2C_MSG_* are I2C Message flags.
+ */
+
+/** Write message to I2C bus. */
+#define I2C_MSG_WRITE			(0U << 0U)
+
+/** Read message from I2C bus. */
+#define I2C_MSG_READ			BIT(0)
+
+/** @cond INTERNAL_HIDDEN */
+#define I2C_MSG_RW_MASK			BIT(0)
+/** @endcond  */
+
+/** Send STOP after this message. */
+#define I2C_MSG_STOP			BIT(1)
+
+/** RESTART I2C transaction for this message.
+ *
+ * @note Not all I2C drivers have or require explicit support for this
+ * feature. Some drivers require this be present on a read message
+ * that follows a write, or vice-versa.  Some drivers will merge
+ * adjacent fragments into a single transaction using this flag; some
+ * will not. */
+#define I2C_MSG_RESTART			BIT(2)
+
+/** Use 10-bit addressing for this message.
+ *
+ * @note Not all SoC I2C implementations support this feature. */
+#define I2C_MSG_ADDR_10_BITS		BIT(3)
+
+/**
+ * @brief One I2C Message.
+ *
+ * This defines one I2C message to transact on the I2C bus.
+ *
+ * @note Some of the configurations supported by this API may not be
+ * supported by specific SoC I2C hardware implementations, in
+ * particular features related to bus transactions intended to read or
+ * write data from different buffers within a single transaction.
+ * Invocations of i2c_transfer() may not indicate an error when an
+ * unsupported configuration is encountered.  In some cases drivers
+ * will generate separate transactions for each message fragment, with
+ * or without presence of @ref I2C_MSG_RESTART in #flags.
+ */
+struct i2c_msg {
+	/** Data buffer in bytes */
+	u8_t		*buf;
+
+	/** Length of buffer in bytes */
+	u32_t	len;
+
+	/** Flags for this message */
+	u8_t		flags;
+};
+
+/**
+ * @cond INTERNAL_HIDDEN
+ *
+ * These are for internal use only, so skip these in
+ * public documentation.
+ */
+struct i2c_slave_config;
+
+typedef int (*i2c_slave_write_requested_cb_t)(
+		struct i2c_slave_config *config);
+typedef int (*i2c_slave_read_requested_cb_t)(
+		struct i2c_slave_config *config, u8_t *val);
+typedef int (*i2c_slave_write_received_cb_t)(
+		struct i2c_slave_config *config, u8_t val);
+typedef int (*i2c_slave_read_processed_cb_t)(
+		struct i2c_slave_config *config, u8_t *val);
+typedef int (*i2c_slave_stop_cb_t)(struct i2c_slave_config *config);
+
+struct i2c_slave_callbacks {
+	/** callback function being called when write is requested */
+	i2c_slave_write_requested_cb_t write_requested;
+	/** callback function being called when read is requested */
+	i2c_slave_read_requested_cb_t read_requested;
+	/** callback function being called when byte has been received */
+	i2c_slave_write_received_cb_t write_received;
+	/** callback function being called when byte has been sent */
+	i2c_slave_read_processed_cb_t read_processed;
+	/** callback function being called when stop occurs on the bus */
+	i2c_slave_stop_cb_t stop;
+};
+
+struct i2c_slave_config {
+	/** Private, do not modify */
+	sys_snode_t node;
+	/** Flags for the slave device defined by I2C_SLAVE_FLAGS_* constants */
+	u8_t flags;
+	/** Address for this slave device */
+	u16_t address;
+	/** Callback functions */
+	const struct i2c_slave_callbacks *callbacks;
+};
+
+typedef int (*i2c_api_configure_t)(struct device *dev,
+				   u32_t dev_config);
+typedef int (*i2c_api_full_io_t)(struct device *dev,
+				 struct i2c_msg *msgs,
+				 u8_t num_msgs,
+				 u16_t addr);
+typedef int (*i2c_api_slave_register_t)(struct device *dev,
+					struct i2c_slave_config *cfg);
+typedef int (*i2c_api_slave_unregister_t)(struct device *dev,
+					  struct i2c_slave_config *cfg);
+
+struct i2c_driver_api {
+	i2c_api_configure_t configure;
+	i2c_api_full_io_t transfer;
+	i2c_api_slave_register_t slave_register;
+	i2c_api_slave_unregister_t slave_unregister;
+};
+
+typedef int (*i2c_slave_api_register_t)(struct device *dev);
+typedef int (*i2c_slave_api_unregister_t)(struct device *dev);
+
+struct i2c_slave_driver_api {
+	i2c_slave_api_register_t driver_register;
+	i2c_slave_api_unregister_t driver_unregister;
+};
+/**
+ * @endcond
+ */
+
+/**
+ * @brief Configure operation of a host controller.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_config Bit-packed 32-bit value to the device runtime configuration
+ * for the I2C controller.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error, failed to configure device.
+ */
+__syscall int i2c_configure(struct device *dev, u32_t dev_config);
+
+static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config)
+{
+	const struct i2c_driver_api *api =
+		(const struct i2c_driver_api *)dev->driver_api;
+
+	return api->configure(dev, dev_config);
+}
+
+/**
+ * @brief Perform data transfer to another I2C device.
+ *
+ * This routine provides a generic interface to perform data transfer
+ * to another I2C device synchronously. Use i2c_read()/i2c_write()
+ * for simple read or write.
+ *
+ * The array of message @a msgs must not be NULL.  The number of
+ * message @a num_msgs may be zero,in which case no transfer occurs.
+ *
+ * @note Not all scatter/gather transactions can be supported by all
+ * drivers.  As an example, a gather write (multiple consecutive
+ * `i2c_msg` buffers all configured for `I2C_MSG_WRITE`) may be packed
+ * into a single transaction by some drivers, but others may emit each
+ * fragment as a distinct write transaction, which will not produce
+ * the same behavior.  See the documentation of `struct i2c_msg` for
+ * limitations on support for multi-message bus transactions.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param msgs Array of messages to transfer.
+ * @param num_msgs Number of messages to transfer.
+ * @param addr Address of the I2C target device.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+__syscall int i2c_transfer(struct device *dev,
+			   struct i2c_msg *msgs, u8_t num_msgs,
+			   u16_t addr);
+
+static inline int z_impl_i2c_transfer(struct device *dev,
+				     struct i2c_msg *msgs, u8_t num_msgs,
+				     u16_t addr)
+{
+	const struct i2c_driver_api *api =
+		(const struct i2c_driver_api *)dev->driver_api;
+
+	return api->transfer(dev, msgs, num_msgs, addr);
+}
+
+/**
+ * @brief Registers the provided config as Slave device
+ *
+ * Enable I2C slave mode for the 'dev' I2C bus driver using the provided
+ * 'config' struct containing the functions and parameters to send bus
+ * events. The I2C slave will be registered at the address provided as 'address'
+ * struct member. Addressing mode - 7 or 10 bit - depends on the 'flags'
+ * struct member. Any I2C bus events related to the slave mode will be passed
+ * onto I2C slave device driver via a set of callback functions provided in
+ * the 'callbacks' struct member.
+ *
+ * Most of the existing hardware allows simultaneous support for master
+ * and slave mode. This is however not guaranteed.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param cfg Config struct with functions and parameters used by the I2C driver
+ * to send bus events
+ *
+ * @retval 0 Is successful
+ * @retval -EINVAL If parameters are invalid
+ * @retval -EIO General input / output error.
+ * @retval -ENOTSUP If slave mode is not supported
+ */
+__syscall int i2c_slave_register(struct device *dev,
+				 struct i2c_slave_config *cfg);
+
+static inline int z_impl_i2c_slave_register(struct device *dev,
+					   struct i2c_slave_config *cfg)
+{
+	const struct i2c_driver_api *api =
+		(const struct i2c_driver_api *)dev->driver_api;
+
+	if (api->slave_register == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->slave_register(dev, cfg);
+}
+
+/**
+ * @brief Unregisters the provided config as Slave device
+ *
+ * This routine disables I2C slave mode for the 'dev' I2C bus driver using
+ * the provided 'config' struct containing the functions and parameters
+ * to send bus events.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param cfg Config struct with functions and parameters used by the I2C driver
+ * to send bus events
+ *
+ * @retval 0 Is successful
+ * @retval -EINVAL If parameters are invalid
+ * @retval -ENOTSUP If slave mode is not supported
+ */
+__syscall int i2c_slave_unregister(struct device *dev,
+				   struct i2c_slave_config *cfg);
+
+static inline int z_impl_i2c_slave_unregister(struct device *dev,
+					     struct i2c_slave_config *cfg)
+{
+	const struct i2c_driver_api *api =
+		(const struct i2c_driver_api *)dev->driver_api;
+
+	if (api->slave_unregister == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->slave_unregister(dev, cfg);
+}
+
+/**
+ * @brief Instructs the I2C Slave device to register itself to the I2C Controller
+ *
+ * This routine instructs the I2C Slave device to register itself to the I2C
+ * Controller.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ *
+ * @retval 0 Is successful
+ * @retval -EINVAL If parameters are invalid
+ * @retval -EIO General input / output error.
+ */
+__syscall int i2c_slave_driver_register(struct device *dev);
+
+static inline int z_impl_i2c_slave_driver_register(struct device *dev)
+{
+	const struct i2c_slave_driver_api *api =
+		(const struct i2c_slave_driver_api *)dev->driver_api;
+
+	return api->driver_register(dev);
+}
+
+/**
+ * @brief Instructs the I2C Slave device to unregister itself from the I2C
+ * Controller
+ *
+ * This routine instructs the I2C Slave device to unregister itself from the I2C
+ * Controller.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ *
+ * @retval 0 Is successful
+ * @retval -EINVAL If parameters are invalid
+ */
+__syscall int i2c_slave_driver_unregister(struct device *dev);
+
+static inline int z_impl_i2c_slave_driver_unregister(struct device *dev)
+{
+	const struct i2c_slave_driver_api *api =
+		(const struct i2c_slave_driver_api *)dev->driver_api;
+
+	return api->driver_unregister(dev);
+}
+
+/*
+ * Derived i2c APIs -- all implemented in terms of i2c_transfer()
+ */
+
+/**
+ * @brief Write a set amount of data to an I2C device.
+ *
+ * This routine writes a set amount of data synchronously.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param buf Memory pool from which the data is transferred.
+ * @param num_bytes Number of bytes to write.
+ * @param addr Address to the target I2C device for writing.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_write(struct device *dev, const u8_t *buf,
+			    u32_t num_bytes, u16_t addr)
+{
+	struct i2c_msg msg;
+
+	msg.buf = (u8_t *)buf;
+	msg.len = num_bytes;
+	msg.flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, &msg, 1, addr);
+}
+
+/**
+ * @brief Read a set amount of data from an I2C device.
+ *
+ * This routine reads a set amount of data synchronously.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param buf Memory pool that stores the retrieved data.
+ * @param num_bytes Number of bytes to read.
+ * @param addr Address of the I2C device being read.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_read(struct device *dev, u8_t *buf,
+			   u32_t num_bytes, u16_t addr)
+{
+	struct i2c_msg msg;
+
+	msg.buf = buf;
+	msg.len = num_bytes;
+	msg.flags = I2C_MSG_READ | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, &msg, 1, addr);
+}
+
+/**
+ * @brief Write then read data from an I2C device.
+ *
+ * This supports the common operation "this is what I want", "now give
+ * it to me" transaction pair through a combined write-then-read bus
+ * transaction.
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param addr Address of the I2C device
+ * @param write_buf Pointer to the data to be written
+ * @param num_write Number of bytes to write
+ * @param read_buf Pointer to storage for read data
+ * @param num_read Number of bytes to read
+ *
+ * @retval 0 if successful
+ * @retval negative on error.
+ */
+static inline int i2c_write_read(struct device *dev, u16_t addr,
+				 const void *write_buf, size_t num_write,
+				 void *read_buf, size_t num_read)
+{
+	struct i2c_msg msg[2];
+
+	msg[0].buf = (u8_t *)write_buf;
+	msg[0].len = num_write;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (u8_t *)read_buf;
+	msg[1].len = num_read;
+	msg[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, addr);
+}
+
+/**
+ * @brief Read multiple bytes from an internal address of an I2C device.
+ *
+ * This routine reads multiple bytes from an internal address of an
+ * I2C device synchronously.
+ *
+ * Instances of this may be replaced by i2c_write_read().
+
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading.
+ * @param start_addr Internal address from which the data is being read.
+ * @param buf Memory pool that stores the retrieved data.
+ * @param num_bytes Number of bytes being read.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_burst_read(struct device *dev,
+				 u16_t dev_addr,
+				 u8_t start_addr,
+				 u8_t *buf,
+				 u32_t num_bytes)
+{
+	return i2c_write_read(dev, dev_addr,
+			      &start_addr, sizeof(start_addr),
+			      buf, num_bytes);
+}
+
+/**
+ * @brief Write multiple bytes to an internal address of an I2C device.
+ *
+ * This routine writes multiple bytes to an internal address of an
+ * I2C device synchronously.
+ *
+ * @warning The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Uses of this API may be made more
+ * portable by replacing them with calls to i2c_write() passing a
+ * buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param start_addr Internal address to which the data is being written.
+ * @param buf Memory pool from which the data is transferred.
+ * @param num_bytes Number of bytes being written.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_burst_write(struct device *dev,
+				  u16_t dev_addr,
+				  u8_t start_addr,
+				  const u8_t *buf,
+				  u32_t num_bytes)
+{
+	struct i2c_msg msg[2];
+
+	msg[0].buf = &start_addr;
+	msg[0].len = 1U;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (u8_t *)buf;
+	msg[1].len = num_bytes;
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Read internal register of an I2C device.
+ *
+ * This routine reads the value of an 8-bit internal register of an I2C
+ * device synchronously.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading.
+ * @param reg_addr Address of the internal register being read.
+ * @param value Memory pool that stores the retrieved register value.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr,
+				    u8_t reg_addr, u8_t *value)
+{
+	return i2c_write_read(dev, dev_addr,
+			      &reg_addr, sizeof(reg_addr),
+			      value, sizeof(*value));
+}
+
+/**
+ * @brief Write internal register of an I2C device.
+ *
+ * This routine writes a value to an 8-bit internal register of an I2C
+ * device synchronously.
+ *
+ * @note This function internally combines the register and value into
+ * a single bus transaction.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param reg_addr Address of the internal register being written.
+ * @param value Value to be written to internal register.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr,
+				     u8_t reg_addr, u8_t value)
+{
+	u8_t tx_buf[2] = {reg_addr, value};
+
+	return i2c_write(dev, tx_buf, 2, dev_addr);
+}
+
+/**
+ * @brief Update internal register of an I2C device.
+ *
+ * This routine updates the value of a set of bits from an 8-bit internal
+ * register of an I2C device synchronously.
+ *
+ * @note If the calculated new register value matches the value that
+ * was read this function will not generate a write operation.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for updating.
+ * @param reg_addr Address of the internal register being updated.
+ * @param mask Bitmask for updating internal register.
+ * @param value Value for updating internal register.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ */
+static inline int i2c_reg_update_byte(struct device *dev, u8_t dev_addr,
+				      u8_t reg_addr, u8_t mask,
+				      u8_t value)
+{
+	u8_t old_value, new_value;
+	int rc;
+
+	rc = i2c_reg_read_byte(dev, dev_addr, reg_addr, &old_value);
+	if (rc != 0) {
+		return rc;
+	}
+
+	new_value = (old_value & ~mask) | (value & mask);
+	if (new_value == old_value) {
+		return 0;
+	}
+
+	return i2c_reg_write_byte(dev, dev_addr, reg_addr, new_value);
+}
+
+/**
+ * @brief Read multiple bytes from an internal 16 bit address of an I2C device.
+ *
+ * This routine reads multiple bytes from a 16 bit internal address of an
+ * I2C device synchronously.
+ *
+ * @deprecated Replace with i2c_write_read().
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading
+ * @param start_addr Internal 16 bit address from which the data is
+ * being read.  Target device will receive this in big-endian byte
+ * order.
+ * @param buf Memory pool that stores the retrieved data.
+ * @param num_bytes Number of bytes being read.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_burst_read16(struct device *dev,
+						u16_t dev_addr,
+						u16_t start_addr,
+						u8_t *buf,
+						u32_t num_bytes)
+{
+	u8_t addr_buffer[2];
+
+	addr_buffer[1] = start_addr & 0xFF;
+	addr_buffer[0] = start_addr >> 8;
+	return i2c_write_read(dev, dev_addr,
+			      addr_buffer, sizeof(addr_buffer),
+			      buf, num_bytes);
+}
+
+/**
+ * @brief Write multiple bytes to a 16 bit internal address of an I2C device.
+ *
+ * This routine writes multiple bytes to a 16 bit internal address of an
+ * I2C device synchronously.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a single call to
+ * i2c_write() with a buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param start_addr Internal 16 bit address from which the data is
+ * being written.  Target device will receive this in big-endian byte
+ * order.
+ * @param buf Memory pool from which the data is transferred.
+ * @param num_bytes Number of bytes being written.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_burst_write16(struct device *dev,
+						 u16_t dev_addr,
+						 u16_t start_addr,
+						 const u8_t *buf,
+						 u32_t num_bytes)
+{
+	u8_t addr_buffer[2];
+	struct i2c_msg msg[2];
+
+	addr_buffer[1] = start_addr & 0xFF;
+	addr_buffer[0] = start_addr >> 8;
+	msg[0].buf = addr_buffer;
+	msg[0].len = 2U;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (u8_t *)buf;
+	msg[1].len = num_bytes;
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Read internal 16 bit address register of an I2C device.
+ *
+ * This routine reads the 8-bit value of internal register identified
+ * by a 16-bit register address synchronously.
+ *
+ * @deprecated Replace with i2c_write_read().
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading.
+ * @param reg_addr 16 bit address of the internal register being read.
+ * @param value Memory pool that stores the retrieved register value.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_read16(struct device *dev,
+					      u16_t dev_addr,
+					      u16_t reg_addr,
+					      u8_t *value)
+{
+	u8_t addr_buffer[2];
+
+	addr_buffer[1] = reg_addr & 0xFFU;
+	addr_buffer[0] = reg_addr >> 8U;
+	return i2c_write_read(dev, dev_addr,
+			      addr_buffer, sizeof(addr_buffer),
+			      value, sizeof(*value));
+}
+
+/**
+ * @brief Write internal 16 bit address register of an I2C device.
+ *
+ * This routine writes a value to an 16-bit internal register of an I2C
+ * device synchronously.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a single call to
+ * i2c_write() with a buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param reg_addr 16 bit address of the internal register being written.
+ * @param value Value to be written to internal register.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_write16(struct device *dev,
+					       u16_t dev_addr,
+					       u16_t reg_addr,
+					       u8_t value)
+{
+	u8_t addr_buffer[2];
+	struct i2c_msg msg[2];
+
+	addr_buffer[1] = reg_addr & 0xFFU;
+	addr_buffer[0] = reg_addr >> 8U;
+	msg[0].buf = addr_buffer;
+	msg[0].len = 2UL;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (u8_t *)&value;
+	msg[1].len = sizeof(value);
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Update internal 16 bit address register of an I2C device.
+ *
+ * This routine updates the value of a set of bits from a 16-bit internal
+ * register of an I2C device synchronously.
+ *
+ * @note If the calculated new register value matches the value that
+ * was read this function will not generate a write operation.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a call to
+ * i2c_write_read() followed by value manipulation, then a call to
+ * i2c_write() with a buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for updating.
+ * @param reg_addr 16 bit address of the internal register being updated.
+ * @param mask Bitmask for updating internal register.
+ * @param value Value for updating internal register.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_update16(struct device *dev,
+						u16_t dev_addr,
+						u16_t reg_addr,
+						u8_t mask,
+						u8_t value)
+{
+	u8_t addr_buffer[2];
+	struct i2c_msg msg[2];
+	u8_t old_value, new_value;
+	int rc;
+
+	addr_buffer[1] = reg_addr & 0xFFU;
+	addr_buffer[0] = reg_addr >> 8U;
+	rc = i2c_write_read(dev, dev_addr,
+			    addr_buffer, sizeof(addr_buffer),
+			    &old_value, sizeof(old_value));
+	if (rc != 0) {
+		return rc;
+	}
+
+	new_value = (old_value & ~mask) | (value & mask);
+	if (new_value == old_value) {
+		return 0;
+	}
+
+	msg[0].buf = addr_buffer;
+	msg[0].len = 2UL;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = &new_value;
+	msg[1].len = sizeof(new_value);
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Read multiple bytes from an internal variable byte size
+ * address of an I2C device.
+ *
+ * This routine reads multiple bytes from an addr_size byte internal
+ * address of an I2C device synchronously.
+ *
+ * @deprecated Replace with i2c_write_read().
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading.
+ * @param start_addr Array to an internal register address from which
+ *		     the data is being read.
+ * @param addr_size Size in bytes of the register address.
+ * @param buf Memory pool that stores the retrieved data.
+ * @param num_bytes Number of bytes being read.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_burst_read_addr(struct device *dev,
+						   u16_t dev_addr,
+						   const u8_t *start_addr,
+						   const u8_t addr_size,
+						   u8_t *buf,
+						   u32_t num_bytes)
+{
+	return i2c_write_read(dev, dev_addr, start_addr, addr_size,
+			      buf, num_bytes);
+}
+
+/**
+ * @brief Write multiple bytes to an internal variable bytes size
+ * address of an I2C device.
+ * This routine writes multiple bytes to an addr_size byte internal
+ * address of an I2C device synchronously.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a single call to
+ * i2c_write() with a buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param start_addr Array to an internal register address from which
+ *		     the data is being read.
+ * @param addr_size Size in bytes of the register address.
+ * @param buf Memory pool from which the data is transferred.
+ * @param num_bytes Number of bytes being written.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_burst_write_addr(struct device *dev,
+						    u16_t dev_addr,
+						    const u8_t *start_addr,
+						    const u8_t addr_size,
+						    const u8_t *buf,
+						    u32_t num_bytes)
+{
+	struct i2c_msg msg[2];
+
+	msg[0].buf = (u8_t *)start_addr;
+	msg[0].len = addr_size;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (u8_t *)buf;
+	msg[1].len = num_bytes;
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Read internal variable byte size address register
+ * of an I2C device.
+ *
+ * This routine reads the value of an addr_size byte internal register
+ * of an I2C device synchronously.
+ *
+ * @deprecated Replace with i2c_write_read().
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for reading.
+ * @param reg_addr Array to an internal register address from which
+ *		     the data is being read.
+ * @param addr_size Size in bytes of the register address.
+ * @param value Memory pool that stores the retrieved register value.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_read_addr(struct device *dev,
+						 u16_t dev_addr,
+						 const u8_t *reg_addr,
+						 u8_t addr_size,
+						 u8_t *value)
+{
+	return i2c_write_read(dev, dev_addr, reg_addr, addr_size,
+			      value, sizeof(*value));
+}
+
+/**
+ * @brief Write internal variable byte size address register
+ * of an I2C device.
+ *
+ * This routine writes a value to an addr_size byte internal register
+ * of an I2C device synchronously.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a single call to
+ * i2c_write() with a buffer containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for writing.
+ * @param reg_addr Array to an internal register address from which
+ *		     the data is being read.
+ * @param addr_size Size in bytes of the register address.
+ * @param value Value to be written to internal register.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_write_addr(struct device *dev,
+						  u16_t dev_addr,
+						  const u8_t *reg_addr,
+						  const u8_t addr_size,
+						  u8_t value)
+{
+	struct i2c_msg msg[2];
+
+	msg[0].buf = (u8_t *)reg_addr;
+	msg[0].len = addr_size;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = &value;
+	msg[1].len = sizeof(value);
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+/**
+ * @brief Update internal variable byte size address register
+ * of an I2C device.
+ *
+ * This routine updates the value of a set of bits from a addr_size byte
+ * internal register of an I2C device synchronously.
+ *
+ * @note If the calculated new register value matches the value that
+ * was read this function will not generate a write operation.
+ *
+ * @deprecated The combined write synthesized by this API may not be
+ * supported on all I2C devices.  Replace this with a call to
+ * i2c_read() followed by a call to i2c_write() with a buffer
+ * containing the combined address and data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param dev_addr Address of the I2C device for updating.
+ * @param reg_addr Array to an internal register address from which
+ *		     the data is being read.
+ * @param addr_size Size in bytes of the register address.
+ * @param mask Bitmask for updating internal register.
+ * @param value Value for updating internal register.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__deprecated static inline int i2c_reg_update_addr(struct device *dev,
+						   u16_t dev_addr,
+						   const u8_t *reg_addr,
+						   u8_t addr_size,
+						   u8_t mask,
+						   u8_t value)
+{
+	struct i2c_msg msg[2];
+	u8_t old_value, new_value;
+	int rc;
+
+	rc = i2c_write_read(dev, dev_addr, reg_addr, addr_size,
+			    &old_value, sizeof(old_value));
+	if (rc != 0) {
+		return rc;
+	}
+
+	new_value = (old_value & ~mask) | (value & mask);
+	if (new_value == old_value) {
+		return 0;
+	}
+
+	msg[0].buf = (u8_t *)reg_addr;
+	msg[0].len = addr_size;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = &new_value;
+	msg[1].len = sizeof(new_value);
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	return i2c_transfer(dev, msg, 2, dev_addr);
+}
+
+struct i2c_client_config {
+	char *i2c_master;
+	u16_t i2c_addr;
+};
+
+#define I2C_DECLARE_CLIENT_CONFIG	struct i2c_client_config i2c_client
+
+#define I2C_CLIENT(_master, _addr)		\
+	.i2c_client = {				\
+		.i2c_master = (_master),	\
+		.i2c_addr = (_addr),		\
+	}
+
+#define I2C_GET_MASTER(_conf)		((_conf)->i2c_client.i2c_master)
+#define I2C_GET_ADDR(_conf)		((_conf)->i2c_client.i2c_addr)
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ * @}
+ */
+
+#include <syscalls/i2c.h>
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_I2C_H_ */
diff --git a/include/i2c.h b/include/i2c.h
index 48820786ab4..fafe8c77a08 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -1,1040 +1,15 @@
-/**
- * @file
- *
- * @brief Public APIs for the I2C drivers.
- */
-
 /*
- * Copyright (c) 2015 Intel Corporation
+ * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef ZEPHYR_INCLUDE_I2C_H_
 #define ZEPHYR_INCLUDE_I2C_H_
 
-/**
- * @brief I2C Interface
- * @defgroup i2c_interface I2C Interface
- * @ingroup io_interfaces
- * @{
- */
-
-#include <zephyr/types.h>
-#include <device.h>
-
-#ifdef __cplusplus
-extern "C" {
+#ifndef CONFIG_COMPAT_INCLUDES
+#warning "This header file has moved, include <drivers/i2c.h> instead."
 #endif
 
-/*
- * The following #defines are used to configure the I2C controller.
- */
-
-/** I2C Standard Speed */
-#define I2C_SPEED_STANDARD		(0x1U)
-
-/** I2C Fast Speed */
-#define I2C_SPEED_FAST			(0x2U)
-
-/** I2C Fast Plus Speed */
-#define I2C_SPEED_FAST_PLUS		(0x3U)
-
-/** I2C High Speed */
-#define I2C_SPEED_HIGH			(0x4U)
-
-/** I2C Ultra Fast Speed */
-#define I2C_SPEED_ULTRA			(0x5U)
-
-#define I2C_SPEED_SHIFT			(1U)
-#define I2C_SPEED_SET(speed)		(((speed) << I2C_SPEED_SHIFT) \
-						& I2C_SPEED_MASK)
-#define I2C_SPEED_MASK			(0x7U << I2C_SPEED_SHIFT) /* 3 bits */
-#define I2C_SPEED_GET(cfg) 		(((cfg) & I2C_SPEED_MASK) \
-						>> I2C_SPEED_SHIFT)
-
-/** Use 10-bit addressing. DEPRECATED - Use I2C_MSG_ADDR_10_BITS instead. */
-#define I2C_ADDR_10_BITS		BIT(0)
-
-/** Controller to act as Master. */
-#define I2C_MODE_MASTER			BIT(4)
-
-/*
- * The following #defines are used to configure the I2C slave device
- */
-
-/** Slave device responds to 10-bit addressing. */
-#define I2C_SLAVE_FLAGS_ADDR_10_BITS	BIT(0)
-
-/*
- * I2C_MSG_* are I2C Message flags.
- */
-
-/** Write message to I2C bus. */
-#define I2C_MSG_WRITE			(0U << 0U)
-
-/** Read message from I2C bus. */
-#define I2C_MSG_READ			BIT(0)
-
-/** @cond INTERNAL_HIDDEN */
-#define I2C_MSG_RW_MASK			BIT(0)
-/** @endcond  */
-
-/** Send STOP after this message. */
-#define I2C_MSG_STOP			BIT(1)
-
-/** RESTART I2C transaction for this message.
- *
- * @note Not all I2C drivers have or require explicit support for this
- * feature. Some drivers require this be present on a read message
- * that follows a write, or vice-versa.  Some drivers will merge
- * adjacent fragments into a single transaction using this flag; some
- * will not. */
-#define I2C_MSG_RESTART			BIT(2)
-
-/** Use 10-bit addressing for this message.
- *
- * @note Not all SoC I2C implementations support this feature. */
-#define I2C_MSG_ADDR_10_BITS		BIT(3)
-
-/**
- * @brief One I2C Message.
- *
- * This defines one I2C message to transact on the I2C bus.
- *
- * @note Some of the configurations supported by this API may not be
- * supported by specific SoC I2C hardware implementations, in
- * particular features related to bus transactions intended to read or
- * write data from different buffers within a single transaction.
- * Invocations of i2c_transfer() may not indicate an error when an
- * unsupported configuration is encountered.  In some cases drivers
- * will generate separate transactions for each message fragment, with
- * or without presence of @ref I2C_MSG_RESTART in #flags.
- */
-struct i2c_msg {
-	/** Data buffer in bytes */
-	u8_t		*buf;
-
-	/** Length of buffer in bytes */
-	u32_t	len;
-
-	/** Flags for this message */
-	u8_t		flags;
-};
-
-/**
- * @cond INTERNAL_HIDDEN
- *
- * These are for internal use only, so skip these in
- * public documentation.
- */
-struct i2c_slave_config;
-
-typedef int (*i2c_slave_write_requested_cb_t)(
-		struct i2c_slave_config *config);
-typedef int (*i2c_slave_read_requested_cb_t)(
-		struct i2c_slave_config *config, u8_t *val);
-typedef int (*i2c_slave_write_received_cb_t)(
-		struct i2c_slave_config *config, u8_t val);
-typedef int (*i2c_slave_read_processed_cb_t)(
-		struct i2c_slave_config *config, u8_t *val);
-typedef int (*i2c_slave_stop_cb_t)(struct i2c_slave_config *config);
-
-struct i2c_slave_callbacks {
-	/** callback function being called when write is requested */
-	i2c_slave_write_requested_cb_t write_requested;
-	/** callback function being called when read is requested */
-	i2c_slave_read_requested_cb_t read_requested;
-	/** callback function being called when byte has been received */
-	i2c_slave_write_received_cb_t write_received;
-	/** callback function being called when byte has been sent */
-	i2c_slave_read_processed_cb_t read_processed;
-	/** callback function being called when stop occurs on the bus */
-	i2c_slave_stop_cb_t stop;
-};
-
-struct i2c_slave_config {
-	/** Private, do not modify */
-	sys_snode_t node;
-	/** Flags for the slave device defined by I2C_SLAVE_FLAGS_* constants */
-	u8_t flags;
-	/** Address for this slave device */
-	u16_t address;
-	/** Callback functions */
-	const struct i2c_slave_callbacks *callbacks;
-};
-
-typedef int (*i2c_api_configure_t)(struct device *dev,
-				   u32_t dev_config);
-typedef int (*i2c_api_full_io_t)(struct device *dev,
-				 struct i2c_msg *msgs,
-				 u8_t num_msgs,
-				 u16_t addr);
-typedef int (*i2c_api_slave_register_t)(struct device *dev,
-					struct i2c_slave_config *cfg);
-typedef int (*i2c_api_slave_unregister_t)(struct device *dev,
-					  struct i2c_slave_config *cfg);
-
-struct i2c_driver_api {
-	i2c_api_configure_t configure;
-	i2c_api_full_io_t transfer;
-	i2c_api_slave_register_t slave_register;
-	i2c_api_slave_unregister_t slave_unregister;
-};
-
-typedef int (*i2c_slave_api_register_t)(struct device *dev);
-typedef int (*i2c_slave_api_unregister_t)(struct device *dev);
-
-struct i2c_slave_driver_api {
-	i2c_slave_api_register_t driver_register;
-	i2c_slave_api_unregister_t driver_unregister;
-};
-/**
- * @endcond
- */
-
-/**
- * @brief Configure operation of a host controller.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_config Bit-packed 32-bit value to the device runtime configuration
- * for the I2C controller.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error, failed to configure device.
- */
-__syscall int i2c_configure(struct device *dev, u32_t dev_config);
-
-static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config)
-{
-	const struct i2c_driver_api *api =
-		(const struct i2c_driver_api *)dev->driver_api;
-
-	return api->configure(dev, dev_config);
-}
-
-/**
- * @brief Perform data transfer to another I2C device.
- *
- * This routine provides a generic interface to perform data transfer
- * to another I2C device synchronously. Use i2c_read()/i2c_write()
- * for simple read or write.
- *
- * The array of message @a msgs must not be NULL.  The number of
- * message @a num_msgs may be zero,in which case no transfer occurs.
- *
- * @note Not all scatter/gather transactions can be supported by all
- * drivers.  As an example, a gather write (multiple consecutive
- * `i2c_msg` buffers all configured for `I2C_MSG_WRITE`) may be packed
- * into a single transaction by some drivers, but others may emit each
- * fragment as a distinct write transaction, which will not produce
- * the same behavior.  See the documentation of `struct i2c_msg` for
- * limitations on support for multi-message bus transactions.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param msgs Array of messages to transfer.
- * @param num_msgs Number of messages to transfer.
- * @param addr Address of the I2C target device.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-__syscall int i2c_transfer(struct device *dev,
-			   struct i2c_msg *msgs, u8_t num_msgs,
-			   u16_t addr);
-
-static inline int z_impl_i2c_transfer(struct device *dev,
-				     struct i2c_msg *msgs, u8_t num_msgs,
-				     u16_t addr)
-{
-	const struct i2c_driver_api *api =
-		(const struct i2c_driver_api *)dev->driver_api;
-
-	return api->transfer(dev, msgs, num_msgs, addr);
-}
-
-/**
- * @brief Registers the provided config as Slave device
- *
- * Enable I2C slave mode for the 'dev' I2C bus driver using the provided
- * 'config' struct containing the functions and parameters to send bus
- * events. The I2C slave will be registered at the address provided as 'address'
- * struct member. Addressing mode - 7 or 10 bit - depends on the 'flags'
- * struct member. Any I2C bus events related to the slave mode will be passed
- * onto I2C slave device driver via a set of callback functions provided in
- * the 'callbacks' struct member.
- *
- * Most of the existing hardware allows simultaneous support for master
- * and slave mode. This is however not guaranteed.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param cfg Config struct with functions and parameters used by the I2C driver
- * to send bus events
- *
- * @retval 0 Is successful
- * @retval -EINVAL If parameters are invalid
- * @retval -EIO General input / output error.
- * @retval -ENOTSUP If slave mode is not supported
- */
-__syscall int i2c_slave_register(struct device *dev,
-				 struct i2c_slave_config *cfg);
-
-static inline int z_impl_i2c_slave_register(struct device *dev,
-					   struct i2c_slave_config *cfg)
-{
-	const struct i2c_driver_api *api =
-		(const struct i2c_driver_api *)dev->driver_api;
-
-	if (api->slave_register == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->slave_register(dev, cfg);
-}
-
-/**
- * @brief Unregisters the provided config as Slave device
- *
- * This routine disables I2C slave mode for the 'dev' I2C bus driver using
- * the provided 'config' struct containing the functions and parameters
- * to send bus events.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param cfg Config struct with functions and parameters used by the I2C driver
- * to send bus events
- *
- * @retval 0 Is successful
- * @retval -EINVAL If parameters are invalid
- * @retval -ENOTSUP If slave mode is not supported
- */
-__syscall int i2c_slave_unregister(struct device *dev,
-				   struct i2c_slave_config *cfg);
-
-static inline int z_impl_i2c_slave_unregister(struct device *dev,
-					     struct i2c_slave_config *cfg)
-{
-	const struct i2c_driver_api *api =
-		(const struct i2c_driver_api *)dev->driver_api;
-
-	if (api->slave_unregister == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->slave_unregister(dev, cfg);
-}
-
-/**
- * @brief Instructs the I2C Slave device to register itself to the I2C Controller
- *
- * This routine instructs the I2C Slave device to register itself to the I2C
- * Controller.
- *
- * @param dev Pointer to the device structure for the driver instance.
- *
- * @retval 0 Is successful
- * @retval -EINVAL If parameters are invalid
- * @retval -EIO General input / output error.
- */
-__syscall int i2c_slave_driver_register(struct device *dev);
-
-static inline int z_impl_i2c_slave_driver_register(struct device *dev)
-{
-	const struct i2c_slave_driver_api *api =
-		(const struct i2c_slave_driver_api *)dev->driver_api;
-
-	return api->driver_register(dev);
-}
-
-/**
- * @brief Instructs the I2C Slave device to unregister itself from the I2C
- * Controller
- *
- * This routine instructs the I2C Slave device to unregister itself from the I2C
- * Controller.
- *
- * @param dev Pointer to the device structure for the driver instance.
- *
- * @retval 0 Is successful
- * @retval -EINVAL If parameters are invalid
- */
-__syscall int i2c_slave_driver_unregister(struct device *dev);
-
-static inline int z_impl_i2c_slave_driver_unregister(struct device *dev)
-{
-	const struct i2c_slave_driver_api *api =
-		(const struct i2c_slave_driver_api *)dev->driver_api;
-
-	return api->driver_unregister(dev);
-}
-
-/*
- * Derived i2c APIs -- all implemented in terms of i2c_transfer()
- */
-
-/**
- * @brief Write a set amount of data to an I2C device.
- *
- * This routine writes a set amount of data synchronously.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param buf Memory pool from which the data is transferred.
- * @param num_bytes Number of bytes to write.
- * @param addr Address to the target I2C device for writing.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_write(struct device *dev, const u8_t *buf,
-			    u32_t num_bytes, u16_t addr)
-{
-	struct i2c_msg msg;
-
-	msg.buf = (u8_t *)buf;
-	msg.len = num_bytes;
-	msg.flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, &msg, 1, addr);
-}
-
-/**
- * @brief Read a set amount of data from an I2C device.
- *
- * This routine reads a set amount of data synchronously.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param buf Memory pool that stores the retrieved data.
- * @param num_bytes Number of bytes to read.
- * @param addr Address of the I2C device being read.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_read(struct device *dev, u8_t *buf,
-			   u32_t num_bytes, u16_t addr)
-{
-	struct i2c_msg msg;
-
-	msg.buf = buf;
-	msg.len = num_bytes;
-	msg.flags = I2C_MSG_READ | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, &msg, 1, addr);
-}
-
-/**
- * @brief Write then read data from an I2C device.
- *
- * This supports the common operation "this is what I want", "now give
- * it to me" transaction pair through a combined write-then-read bus
- * transaction.
- *
- * @param dev Pointer to the device structure for the driver instance
- * @param addr Address of the I2C device
- * @param write_buf Pointer to the data to be written
- * @param num_write Number of bytes to write
- * @param read_buf Pointer to storage for read data
- * @param num_read Number of bytes to read
- *
- * @retval 0 if successful
- * @retval negative on error.
- */
-static inline int i2c_write_read(struct device *dev, u16_t addr,
-				 const void *write_buf, size_t num_write,
-				 void *read_buf, size_t num_read)
-{
-	struct i2c_msg msg[2];
-
-	msg[0].buf = (u8_t *)write_buf;
-	msg[0].len = num_write;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = (u8_t *)read_buf;
-	msg[1].len = num_read;
-	msg[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, addr);
-}
-
-/**
- * @brief Read multiple bytes from an internal address of an I2C device.
- *
- * This routine reads multiple bytes from an internal address of an
- * I2C device synchronously.
- *
- * Instances of this may be replaced by i2c_write_read().
-
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading.
- * @param start_addr Internal address from which the data is being read.
- * @param buf Memory pool that stores the retrieved data.
- * @param num_bytes Number of bytes being read.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_burst_read(struct device *dev,
-				 u16_t dev_addr,
-				 u8_t start_addr,
-				 u8_t *buf,
-				 u32_t num_bytes)
-{
-	return i2c_write_read(dev, dev_addr,
-			      &start_addr, sizeof(start_addr),
-			      buf, num_bytes);
-}
-
-/**
- * @brief Write multiple bytes to an internal address of an I2C device.
- *
- * This routine writes multiple bytes to an internal address of an
- * I2C device synchronously.
- *
- * @warning The combined write synthesized by this API may not be
- * supported on all I2C devices.  Uses of this API may be made more
- * portable by replacing them with calls to i2c_write() passing a
- * buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param start_addr Internal address to which the data is being written.
- * @param buf Memory pool from which the data is transferred.
- * @param num_bytes Number of bytes being written.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_burst_write(struct device *dev,
-				  u16_t dev_addr,
-				  u8_t start_addr,
-				  const u8_t *buf,
-				  u32_t num_bytes)
-{
-	struct i2c_msg msg[2];
-
-	msg[0].buf = &start_addr;
-	msg[0].len = 1U;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = (u8_t *)buf;
-	msg[1].len = num_bytes;
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Read internal register of an I2C device.
- *
- * This routine reads the value of an 8-bit internal register of an I2C
- * device synchronously.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading.
- * @param reg_addr Address of the internal register being read.
- * @param value Memory pool that stores the retrieved register value.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr,
-				    u8_t reg_addr, u8_t *value)
-{
-	return i2c_write_read(dev, dev_addr,
-			      &reg_addr, sizeof(reg_addr),
-			      value, sizeof(*value));
-}
-
-/**
- * @brief Write internal register of an I2C device.
- *
- * This routine writes a value to an 8-bit internal register of an I2C
- * device synchronously.
- *
- * @note This function internally combines the register and value into
- * a single bus transaction.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param reg_addr Address of the internal register being written.
- * @param value Value to be written to internal register.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr,
-				     u8_t reg_addr, u8_t value)
-{
-	u8_t tx_buf[2] = {reg_addr, value};
-
-	return i2c_write(dev, tx_buf, 2, dev_addr);
-}
-
-/**
- * @brief Update internal register of an I2C device.
- *
- * This routine updates the value of a set of bits from an 8-bit internal
- * register of an I2C device synchronously.
- *
- * @note If the calculated new register value matches the value that
- * was read this function will not generate a write operation.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for updating.
- * @param reg_addr Address of the internal register being updated.
- * @param mask Bitmask for updating internal register.
- * @param value Value for updating internal register.
- *
- * @retval 0 If successful.
- * @retval -EIO General input / output error.
- */
-static inline int i2c_reg_update_byte(struct device *dev, u8_t dev_addr,
-				      u8_t reg_addr, u8_t mask,
-				      u8_t value)
-{
-	u8_t old_value, new_value;
-	int rc;
-
-	rc = i2c_reg_read_byte(dev, dev_addr, reg_addr, &old_value);
-	if (rc != 0) {
-		return rc;
-	}
-
-	new_value = (old_value & ~mask) | (value & mask);
-	if (new_value == old_value) {
-		return 0;
-	}
-
-	return i2c_reg_write_byte(dev, dev_addr, reg_addr, new_value);
-}
-
-/**
- * @brief Read multiple bytes from an internal 16 bit address of an I2C device.
- *
- * This routine reads multiple bytes from a 16 bit internal address of an
- * I2C device synchronously.
- *
- * @deprecated Replace with i2c_write_read().
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading
- * @param start_addr Internal 16 bit address from which the data is
- * being read.  Target device will receive this in big-endian byte
- * order.
- * @param buf Memory pool that stores the retrieved data.
- * @param num_bytes Number of bytes being read.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_burst_read16(struct device *dev,
-						u16_t dev_addr,
-						u16_t start_addr,
-						u8_t *buf,
-						u32_t num_bytes)
-{
-	u8_t addr_buffer[2];
-
-	addr_buffer[1] = start_addr & 0xFF;
-	addr_buffer[0] = start_addr >> 8;
-	return i2c_write_read(dev, dev_addr,
-			      addr_buffer, sizeof(addr_buffer),
-			      buf, num_bytes);
-}
-
-/**
- * @brief Write multiple bytes to a 16 bit internal address of an I2C device.
- *
- * This routine writes multiple bytes to a 16 bit internal address of an
- * I2C device synchronously.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a single call to
- * i2c_write() with a buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param start_addr Internal 16 bit address from which the data is
- * being written.  Target device will receive this in big-endian byte
- * order.
- * @param buf Memory pool from which the data is transferred.
- * @param num_bytes Number of bytes being written.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_burst_write16(struct device *dev,
-						 u16_t dev_addr,
-						 u16_t start_addr,
-						 const u8_t *buf,
-						 u32_t num_bytes)
-{
-	u8_t addr_buffer[2];
-	struct i2c_msg msg[2];
-
-	addr_buffer[1] = start_addr & 0xFF;
-	addr_buffer[0] = start_addr >> 8;
-	msg[0].buf = addr_buffer;
-	msg[0].len = 2U;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = (u8_t *)buf;
-	msg[1].len = num_bytes;
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Read internal 16 bit address register of an I2C device.
- *
- * This routine reads the 8-bit value of internal register identified
- * by a 16-bit register address synchronously.
- *
- * @deprecated Replace with i2c_write_read().
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading.
- * @param reg_addr 16 bit address of the internal register being read.
- * @param value Memory pool that stores the retrieved register value.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_read16(struct device *dev,
-					      u16_t dev_addr,
-					      u16_t reg_addr,
-					      u8_t *value)
-{
-	u8_t addr_buffer[2];
-
-	addr_buffer[1] = reg_addr & 0xFFU;
-	addr_buffer[0] = reg_addr >> 8U;
-	return i2c_write_read(dev, dev_addr,
-			      addr_buffer, sizeof(addr_buffer),
-			      value, sizeof(*value));
-}
-
-/**
- * @brief Write internal 16 bit address register of an I2C device.
- *
- * This routine writes a value to an 16-bit internal register of an I2C
- * device synchronously.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a single call to
- * i2c_write() with a buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param reg_addr 16 bit address of the internal register being written.
- * @param value Value to be written to internal register.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_write16(struct device *dev,
-					       u16_t dev_addr,
-					       u16_t reg_addr,
-					       u8_t value)
-{
-	u8_t addr_buffer[2];
-	struct i2c_msg msg[2];
-
-	addr_buffer[1] = reg_addr & 0xFFU;
-	addr_buffer[0] = reg_addr >> 8U;
-	msg[0].buf = addr_buffer;
-	msg[0].len = 2UL;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = (u8_t *)&value;
-	msg[1].len = sizeof(value);
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Update internal 16 bit address register of an I2C device.
- *
- * This routine updates the value of a set of bits from a 16-bit internal
- * register of an I2C device synchronously.
- *
- * @note If the calculated new register value matches the value that
- * was read this function will not generate a write operation.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a call to
- * i2c_write_read() followed by value manipulation, then a call to
- * i2c_write() with a buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for updating.
- * @param reg_addr 16 bit address of the internal register being updated.
- * @param mask Bitmask for updating internal register.
- * @param value Value for updating internal register.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_update16(struct device *dev,
-						u16_t dev_addr,
-						u16_t reg_addr,
-						u8_t mask,
-						u8_t value)
-{
-	u8_t addr_buffer[2];
-	struct i2c_msg msg[2];
-	u8_t old_value, new_value;
-	int rc;
-
-	addr_buffer[1] = reg_addr & 0xFFU;
-	addr_buffer[0] = reg_addr >> 8U;
-	rc = i2c_write_read(dev, dev_addr,
-			    addr_buffer, sizeof(addr_buffer),
-			    &old_value, sizeof(old_value));
-	if (rc != 0) {
-		return rc;
-	}
-
-	new_value = (old_value & ~mask) | (value & mask);
-	if (new_value == old_value) {
-		return 0;
-	}
-
-	msg[0].buf = addr_buffer;
-	msg[0].len = 2UL;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = &new_value;
-	msg[1].len = sizeof(new_value);
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Read multiple bytes from an internal variable byte size
- * address of an I2C device.
- *
- * This routine reads multiple bytes from an addr_size byte internal
- * address of an I2C device synchronously.
- *
- * @deprecated Replace with i2c_write_read().
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading.
- * @param start_addr Array to an internal register address from which
- *		     the data is being read.
- * @param addr_size Size in bytes of the register address.
- * @param buf Memory pool that stores the retrieved data.
- * @param num_bytes Number of bytes being read.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_burst_read_addr(struct device *dev,
-						   u16_t dev_addr,
-						   const u8_t *start_addr,
-						   const u8_t addr_size,
-						   u8_t *buf,
-						   u32_t num_bytes)
-{
-	return i2c_write_read(dev, dev_addr, start_addr, addr_size,
-			      buf, num_bytes);
-}
-
-/**
- * @brief Write multiple bytes to an internal variable bytes size
- * address of an I2C device.
- * This routine writes multiple bytes to an addr_size byte internal
- * address of an I2C device synchronously.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a single call to
- * i2c_write() with a buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param start_addr Array to an internal register address from which
- *		     the data is being read.
- * @param addr_size Size in bytes of the register address.
- * @param buf Memory pool from which the data is transferred.
- * @param num_bytes Number of bytes being written.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_burst_write_addr(struct device *dev,
-						    u16_t dev_addr,
-						    const u8_t *start_addr,
-						    const u8_t addr_size,
-						    const u8_t *buf,
-						    u32_t num_bytes)
-{
-	struct i2c_msg msg[2];
-
-	msg[0].buf = (u8_t *)start_addr;
-	msg[0].len = addr_size;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = (u8_t *)buf;
-	msg[1].len = num_bytes;
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Read internal variable byte size address register
- * of an I2C device.
- *
- * This routine reads the value of an addr_size byte internal register
- * of an I2C device synchronously.
- *
- * @deprecated Replace with i2c_write_read().
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for reading.
- * @param reg_addr Array to an internal register address from which
- *		     the data is being read.
- * @param addr_size Size in bytes of the register address.
- * @param value Memory pool that stores the retrieved register value.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_read_addr(struct device *dev,
-						 u16_t dev_addr,
-						 const u8_t *reg_addr,
-						 u8_t addr_size,
-						 u8_t *value)
-{
-	return i2c_write_read(dev, dev_addr, reg_addr, addr_size,
-			      value, sizeof(*value));
-}
-
-/**
- * @brief Write internal variable byte size address register
- * of an I2C device.
- *
- * This routine writes a value to an addr_size byte internal register
- * of an I2C device synchronously.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a single call to
- * i2c_write() with a buffer containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for writing.
- * @param reg_addr Array to an internal register address from which
- *		     the data is being read.
- * @param addr_size Size in bytes of the register address.
- * @param value Value to be written to internal register.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_write_addr(struct device *dev,
-						  u16_t dev_addr,
-						  const u8_t *reg_addr,
-						  const u8_t addr_size,
-						  u8_t value)
-{
-	struct i2c_msg msg[2];
-
-	msg[0].buf = (u8_t *)reg_addr;
-	msg[0].len = addr_size;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = &value;
-	msg[1].len = sizeof(value);
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-/**
- * @brief Update internal variable byte size address register
- * of an I2C device.
- *
- * This routine updates the value of a set of bits from a addr_size byte
- * internal register of an I2C device synchronously.
- *
- * @note If the calculated new register value matches the value that
- * was read this function will not generate a write operation.
- *
- * @deprecated The combined write synthesized by this API may not be
- * supported on all I2C devices.  Replace this with a call to
- * i2c_read() followed by a call to i2c_write() with a buffer
- * containing the combined address and data.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param dev_addr Address of the I2C device for updating.
- * @param reg_addr Array to an internal register address from which
- *		     the data is being read.
- * @param addr_size Size in bytes of the register address.
- * @param mask Bitmask for updating internal register.
- * @param value Value for updating internal register.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__deprecated static inline int i2c_reg_update_addr(struct device *dev,
-						   u16_t dev_addr,
-						   const u8_t *reg_addr,
-						   u8_t addr_size,
-						   u8_t mask,
-						   u8_t value)
-{
-	struct i2c_msg msg[2];
-	u8_t old_value, new_value;
-	int rc;
-
-	rc = i2c_write_read(dev, dev_addr, reg_addr, addr_size,
-			    &old_value, sizeof(old_value));
-	if (rc != 0) {
-		return rc;
-	}
-
-	new_value = (old_value & ~mask) | (value & mask);
-	if (new_value == old_value) {
-		return 0;
-	}
-
-	msg[0].buf = (u8_t *)reg_addr;
-	msg[0].len = addr_size;
-	msg[0].flags = I2C_MSG_WRITE;
-
-	msg[1].buf = &new_value;
-	msg[1].len = sizeof(new_value);
-	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
-
-	return i2c_transfer(dev, msg, 2, dev_addr);
-}
-
-struct i2c_client_config {
-	char *i2c_master;
-	u16_t i2c_addr;
-};
-
-#define I2C_DECLARE_CLIENT_CONFIG	struct i2c_client_config i2c_client
-
-#define I2C_CLIENT(_master, _addr)		\
-	.i2c_client = {				\
-		.i2c_master = (_master),	\
-		.i2c_addr = (_addr),		\
-	}
-
-#define I2C_GET_MASTER(_conf)		((_conf)->i2c_client.i2c_master)
-#define I2C_GET_ADDR(_conf)		((_conf)->i2c_client.i2c_addr)
-
-#ifdef __cplusplus
-}
-#endif
-
-/**
- * @}
- */
-
-#include <syscalls/i2c.h>
+#include <drivers/i2c.h>
 
 #endif /* ZEPHYR_INCLUDE_I2C_H_ */
diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c
index 214c8b50acf..233e652d7f7 100644
--- a/samples/boards/96b_argonkey/sensors/src/main.c
+++ b/samples/boards/96b_argonkey/sensors/src/main.c
@@ -9,7 +9,7 @@
 
 #include <drivers/gpio.h>
 #include <led.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <spi.h>
 #include <sensor.h>
 
diff --git a/samples/display/grove_display/src/main.c b/samples/display/grove_display/src/main.c
index e30c1bd86b7..78195cdebc4 100644
--- a/samples/display/grove_display/src/main.c
+++ b/samples/display/grove_display/src/main.c
@@ -9,7 +9,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #include <display/grove_lcd.h>
 
diff --git a/samples/drivers/current_sensing/src/main.c b/samples/drivers/current_sensing/src/main.c
index 01db320d170..71a99ec165b 100644
--- a/samples/drivers/current_sensing/src/main.c
+++ b/samples/drivers/current_sensing/src/main.c
@@ -9,7 +9,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 /**
  * @file Sample app using the TI INA219 through I2C.
diff --git a/samples/drivers/i2c_fujitsu_fram/src/main.c b/samples/drivers/i2c_fujitsu_fram/src/main.c
index cafd90d64b7..90e66524f56 100644
--- a/samples/drivers/i2c_fujitsu_fram/src/main.c
+++ b/samples/drivers/i2c_fujitsu_fram/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #if defined(CONFIG_SOC_QUARK_SE_C1000_SS)
 #define I2C_DEV DT_I2C_SS_0_NAME
diff --git a/samples/drivers/i2c_scanner/src/main.c b/samples/drivers/i2c_scanner/src/main.c
index 68c6740ee3f..f5c94cfdd45 100644
--- a/samples/drivers/i2c_scanner/src/main.c
+++ b/samples/drivers/i2c_scanner/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #ifdef ARDUINO_I2C_LABEL
 #define I2C_DEV ARDUINO_I2C_LABEL
diff --git a/samples/sensor/bmg160/src/main.c b/samples/sensor/bmg160/src/main.c
index 61b70de3a2e..43cdb155624 100644
--- a/samples/sensor/bmg160/src/main.c
+++ b/samples/sensor/bmg160/src/main.c
@@ -12,7 +12,7 @@
 
 #include <device.h>
 #include <sensor.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define MAX_TEST_TIME	15000
 #define SLEEPTIME	300
diff --git a/tests/boards/altera_max10/i2c_master/src/i2c_master.c b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
index 8f5615843dd..948a5bd4469 100644
--- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c
+++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <zephyr.h>
 #include <ztest.h>
 
diff --git a/tests/boards/intel_s1000_crb/src/i2c_test.c b/tests/boards/intel_s1000_crb/src/i2c_test.c
index 34e97aebad4..790efe06b05 100644
--- a/tests/boards/intel_s1000_crb/src/i2c_test.c
+++ b/tests/boards/intel_s1000_crb/src/i2c_test.c
@@ -31,7 +31,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define I2C_DEV                 "I2C_0"
 #define I2C_ADDR_LED_MAT0       0x65
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index 4f9a4a6cbc7..cd2a94ab1a1 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -12,7 +12,7 @@
  * @}
  */
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <zephyr.h>
 #include <ztest.h>
 
diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
index 81c6d9526e3..8b161ee5c6d 100644
--- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
+++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
@@ -9,7 +9,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <errno.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c
index 8fcb8851e65..942d9815aeb 100644
--- a/tests/drivers/i2c/i2c_slave_api/src/main.c
+++ b/tests/drivers/i2c/i2c_slave_api/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(main);
 #include <stdio.h>
 #include <misc/util.h>
 
-#include <i2c.h>
+#include <drivers/i2c.h>
 #include <drivers/i2c/slave/eeprom.h>
 
 #include <ztest.h>