summaryrefslogtreecommitdiff
path: root/src/soc/intel/common
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2017-08-01 14:02:40 +0200
committerMartin Roth <martinroth@google.com>2017-08-18 15:33:29 +0000
commit0f2dd1eff9930e30dddd9aabceb5d85ee3b4e980 (patch)
tree50de642731203f720012db6bd2829d8dada2be40 /src/soc/intel/common
parent457fba6be5c2b31f6fc50a5e6feabf73a2663330 (diff)
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>
Diffstat (limited to 'src/soc/intel/common')
-rw-r--r--src/soc/intel/common/block/i2c/i2c.c2
-rw-r--r--src/soc/intel/common/block/i2c/i2c_early.c2
-rw-r--r--src/soc/intel/common/block/i2c/lpss_i2c.c2
-rw-r--r--src/soc/intel/common/block/include/intelblocks/lpss_i2c.h1
4 files changed, 4 insertions, 3 deletions
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>