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/soc/intel/apollolake/chip.h                           | 2 +-
 src/soc/intel/common/block/i2c/i2c.c                      | 2 +-
 src/soc/intel/common/block/i2c/i2c_early.c                | 2 +-
 src/soc/intel/common/block/i2c/lpss_i2c.c                 | 2 +-
 src/soc/intel/common/block/include/intelblocks/lpss_i2c.h | 1 +
 src/soc/intel/quark/gpio_i2c.c                            | 2 +-
 src/soc/intel/quark/i2c.c                                 | 2 +-
 src/soc/intel/skylake/chip.h                              | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/soc/intel')

diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h
index 7b36089b3c..33e2dade88 100644
--- a/src/soc/intel/apollolake/chip.h
+++ b/src/soc/intel/apollolake/chip.h
@@ -22,7 +22,7 @@
 #include <soc/gpio.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/lpss_i2c.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <soc/pm.h>
 #include <soc/usb.h>
 
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index f4b1e8c5ff..aeb6d8f2ed 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -14,7 +14,7 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/i2c.h>
+#include <device/i2c_bus.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/common/block/i2c/i2c_early.c b/src/soc/intel/common/block/i2c/i2c_early.c
index 7c9ce60513..74fc994ca3 100644
--- a/src/soc/intel/common/block/i2c/i2c_early.c
+++ b/src/soc/intel/common/block/i2c/i2c_early.c
@@ -17,7 +17,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <intelblocks/lpss.h>
diff --git a/src/soc/intel/common/block/i2c/lpss_i2c.c b/src/soc/intel/common/block/i2c/lpss_i2c.c
index 711517f6d3..868a6ad300 100644
--- a/src/soc/intel/common/block/i2c/lpss_i2c.c
+++ b/src/soc/intel/common/block/i2c/lpss_i2c.c
@@ -18,7 +18,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h b/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h
index 2f60d654b1..033081f4b9 100644
--- a/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h
+++ b/src/soc/intel/common/block/include/intelblocks/lpss_i2c.h
@@ -16,6 +16,7 @@
 #ifndef SOC_INTEL_COMMON_BLOCK_LPSS_I2C_H
 #define SOC_INTEL_COMMON_BLOCK_LPSS_I2C_H
 
+#include <device/device.h>
 #include <device/i2c.h>
 #include <stdint.h>
 
diff --git a/src/soc/intel/quark/gpio_i2c.c b/src/soc/intel/quark/gpio_i2c.c
index 5580894ee1..d5543b803c 100644
--- a/src/soc/intel/quark/gpio_i2c.c
+++ b/src/soc/intel/quark/gpio_i2c.c
@@ -16,7 +16,7 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <soc/i2c.h>
diff --git a/src/soc/intel/quark/i2c.c b/src/soc/intel/quark/i2c.c
index e8dba5376f..2a194af768 100644
--- a/src/soc/intel/quark/i2c.c
+++ b/src/soc/intel/quark/i2c.c
@@ -17,7 +17,7 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <soc/i2c.h>
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h
index efd3566f76..ea985db11a 100644
--- a/src/soc/intel/skylake/chip.h
+++ b/src/soc/intel/skylake/chip.h
@@ -20,7 +20,7 @@
 #define _SOC_CHIP_H_
 
 #include <arch/acpi_device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/lpss_i2c.h>
 #include <stdint.h>
-- 
cgit v1.2.3