From 0f2dd1eff9930e30dddd9aabceb5d85ee3b4e980 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.huber@secunet.com>
Date: Tue, 1 Aug 2017 14:02:40 +0200
Subject: 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>
---
 src/drivers/i2c/da7219/da7219.c     | 2 +-
 src/drivers/i2c/generic/chip.h      | 2 +-
 src/drivers/i2c/generic/generic.c   | 2 +-
 src/drivers/i2c/max98927/max98927.c | 2 +-
 src/drivers/i2c/nau8825/nau8825.c   | 2 +-
 src/drivers/i2c/rx6110sa/rx6110sa.c | 2 +-
 src/drivers/i2c/tpm/chip.c          | 2 +-
 src/drivers/i2c/tpm/chip.h          | 2 +-
 src/drivers/i2c/tpm/cr50.c          | 2 +-
 src/drivers/i2c/tpm/tis.c           | 2 +-
 src/drivers/i2c/tpm/tis_atmel.c     | 2 +-
 src/drivers/i2c/tpm/tpm.c           | 2 +-
 src/drivers/i2c/ww_ring/ww_ring.c   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/drivers/i2c')

diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index b29a4a15af..2e7d46010e 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 5810db801f..c5d458b6ee 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 f8de1c22d9..b7a535e47f 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 a3e6661a00..976c2f259a 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 a86eff41f3..42dd8478e6 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 2c62f230bd..2402d59ebf 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 1781e996e5..595a05cdbc 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 83df998c96..5abd3a94f3 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 3505dcec1d..baf5fe0cce 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 7cdb2a23b5..20c2d7136a 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 b6e13513f3..151209974a 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 1b078f4c19..2ce04018b3 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 5fb593c727..61dfae7dcf 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"
-- 
cgit v1.2.3