include/device: Split i2c.h into three
Split `i2c.h` into three pieces to ease reuse of the generic defi-
nitions. No code is changed.
* `i2c.h` - keeps the generic definitions
* `i2c_simple.h` - holds the current, limited to one controller driver
per board, devicetree independent I2C interface
* `i2c_bus.h` - will become the devicetree compatible interface for
native I2C (e.g. non-SMBus) controllers
Change-Id: I382d45c70f9314588663e1284f264f877469c74d
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20845
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/drivers/ams/as3722rtc.c b/src/drivers/ams/as3722rtc.c
index 4afcdcc..40285d4 100644
--- a/src/drivers/ams/as3722rtc.c
+++ b/src/drivers/ams/as3722rtc.c
@@ -15,7 +15,7 @@
#include <bcd.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <rtc.h>
#include <stdint.h>
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index b29a4a1..2e7d460 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -17,7 +17,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <stdint.h>
diff --git a/src/drivers/i2c/generic/chip.h b/src/drivers/i2c/generic/chip.h
index 5810db8..c5d458b 100644
--- a/src/drivers/i2c/generic/chip.h
+++ b/src/drivers/i2c/generic/chip.h
@@ -17,7 +17,7 @@
#define __I2C_GENERIC_CHIP_H__
#include <arch/acpi_device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
struct drivers_i2c_generic_config {
const char *hid; /* ACPI _HID (required) */
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index f8de1c2..b7a535e 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -16,7 +16,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <gpio.h>
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index a3e6661..976c2f2 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -17,7 +17,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <stdint.h>
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index a86eff4..42dd847 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -17,7 +17,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <stdint.h>
diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c
index 2c62f23..2402d59 100644
--- a/src/drivers/i2c/rx6110sa/rx6110sa.c
+++ b/src/drivers/i2c/rx6110sa/rx6110sa.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/smbus.h>
#include <device/device.h>
#include <version.h>
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index 1781e99..595a05c 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -16,7 +16,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <stdint.h>
diff --git a/src/drivers/i2c/tpm/chip.h b/src/drivers/i2c/tpm/chip.h
index 83df998..5abd3a9 100644
--- a/src/drivers/i2c/tpm/chip.h
+++ b/src/drivers/i2c/tpm/chip.h
@@ -1,5 +1,5 @@
#include <arch/acpi_device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
struct drivers_i2c_tpm_config {
const char *hid; /* ACPI _HID (required) */
diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c
index 3505dce..baf5fe0 100644
--- a/src/drivers/i2c/tpm/cr50.c
+++ b/src/drivers/i2c/tpm/cr50.c
@@ -36,7 +36,7 @@
#include <types.h>
#include <delay.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <endian.h>
#include <timer.h>
#include <tpm.h>
diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c
index 7cdb2a2..20c2d71 100644
--- a/src/drivers/i2c/tpm/tis.c
+++ b/src/drivers/i2c/tpm/tis.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include <commonlib/endian.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <endian.h>
#include <lib.h>
#include <tpm.h>
diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c
index b6e1351..1512099 100644
--- a/src/drivers/i2c/tpm/tis_atmel.c
+++ b/src/drivers/i2c/tpm/tis_atmel.c
@@ -20,7 +20,7 @@
#include <commonlib/endian.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <endian.h>
#include <lib.h>
#include <tpm.h>
diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c
index 1b078f4..2ce0401 100644
--- a/src/drivers/i2c/tpm/tpm.c
+++ b/src/drivers/i2c/tpm/tpm.c
@@ -35,7 +35,7 @@
#include <types.h>
#include <delay.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <endian.h>
#include <timer.h>
#include <tpm.h>
diff --git a/src/drivers/i2c/ww_ring/ww_ring.c b/src/drivers/i2c/ww_ring/ww_ring.c
index 5fb593c..61dfae7 100644
--- a/src/drivers/i2c/ww_ring/ww_ring.c
+++ b/src/drivers/i2c/ww_ring/ww_ring.c
@@ -28,7 +28,7 @@
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <string.h>
#include "drivers/i2c/ww_ring/ww_ring_programs.h"
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 7752f0a..00ffad9 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -17,7 +17,7 @@
#include <arch/acpi_device.h>
#include <arch/acpigen.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <device/device.h>
#include <device/path.h>
#include <string.h>
diff --git a/src/drivers/maxim/max77686/max77686.c b/src/drivers/maxim/max77686/max77686.c
index d806484..f1ee32f 100644
--- a/src/drivers/maxim/max77686/max77686.c
+++ b/src/drivers/maxim/max77686/max77686.c
@@ -15,7 +15,7 @@
#include <console/console.h>
#include <arch/io.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include "max77686.h"
diff --git a/src/drivers/parade/ps8625/ps8625.c b/src/drivers/parade/ps8625/ps8625.c
index 3943b84..3e90cbb 100644
--- a/src/drivers/parade/ps8625/ps8625.c
+++ b/src/drivers/parade/ps8625/ps8625.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/drivers/parade/ps8640/ps8640.c b/src/drivers/parade/ps8640/ps8640.c
index 62bbf63..c8f4140 100644
--- a/src/drivers/parade/ps8640/ps8640.c
+++ b/src/drivers/parade/ps8640/ps8640.c
@@ -14,7 +14,7 @@
*/
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <edid.h>
#include <console/console.h>
#include <timer.h>
diff --git a/src/drivers/ti/tps65090/tps65090.c b/src/drivers/ti/tps65090/tps65090.c
index 58bb3ce..6eae6fb 100644
--- a/src/drivers/ti/tps65090/tps65090.c
+++ b/src/drivers/ti/tps65090/tps65090.c
@@ -36,7 +36,7 @@
#include <delay.h>
#include <types.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include "tps65090.h"
/* TPS65090 register addresses */
diff --git a/src/drivers/ti/tps65913/tps65913rtc.c b/src/drivers/ti/tps65913/tps65913rtc.c
index f6fed98..0c19b16 100644
--- a/src/drivers/ti/tps65913/tps65913rtc.c
+++ b/src/drivers/ti/tps65913/tps65913rtc.c
@@ -15,7 +15,7 @@
#include <bcd.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <rtc.h>
#include <stdint.h>
diff --git a/src/drivers/xpowers/axp209/axp209.c b/src/drivers/xpowers/axp209/axp209.c
index de11fbe..da575cc 100644
--- a/src/drivers/xpowers/axp209/axp209.c
+++ b/src/drivers/xpowers/axp209/axp209.c
@@ -13,7 +13,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
/* Hide these definitions from the rest of the source, so keep them here */
enum registers {