aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google
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/mainboard/google
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/mainboard/google')
-rw-r--r--src/mainboard/google/daisy/mainboard.c2
-rw-r--r--src/mainboard/google/daisy/romstage.c2
-rw-r--r--src/mainboard/google/foster/bootblock.c2
-rw-r--r--src/mainboard/google/foster/pmic.c2
-rw-r--r--src/mainboard/google/gru/mainboard.c2
-rw-r--r--src/mainboard/google/nyan/bootblock.c2
-rw-r--r--src/mainboard/google/nyan/pmic.c2
-rw-r--r--src/mainboard/google/nyan_big/bootblock.c2
-rw-r--r--src/mainboard/google/nyan_big/pmic.c2
-rw-r--r--src/mainboard/google/nyan_blaze/bootblock.c2
-rw-r--r--src/mainboard/google/nyan_blaze/pmic.c2
-rw-r--r--src/mainboard/google/peach_pit/mainboard.c2
-rw-r--r--src/mainboard/google/peach_pit/romstage.c2
-rw-r--r--src/mainboard/google/smaug/bootblock.c2
-rw-r--r--src/mainboard/google/smaug/mainboard.c2
-rw-r--r--src/mainboard/google/smaug/pmic.c2
-rw-r--r--src/mainboard/google/smaug/romstage.c2
-rw-r--r--src/mainboard/google/veyron/mainboard.c2
-rw-r--r--src/mainboard/google/veyron_mickey/mainboard.c2
-rw-r--r--src/mainboard/google/veyron_rialto/mainboard.c2
20 files changed, 20 insertions, 20 deletions
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index e67bdcfe09..336a9e5f4a 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -19,7 +19,7 @@
#include <cbmem.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <drivers/ti/tps65090/tps65090.h>
#include <edid.h>
#include <soc/clk.h>
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c
index 3c6ff5ebef..33efdf7cba 100644
--- a/src/mainboard/google/daisy/romstage.c
+++ b/src/mainboard/google/daisy/romstage.c
@@ -21,7 +21,7 @@
#include <cbmem.h>
#include <console/console.h>
#include <program_loading.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <drivers/maxim/max77686/max77686.h>
#include <soc/clk.h>
#include <soc/cpu.h>
diff --git a/src/mainboard/google/foster/bootblock.c b/src/mainboard/google/foster/bootblock.c
index a4449f54ed..e986ee3c1c 100644
--- a/src/mainboard/google/foster/bootblock.c
+++ b/src/mainboard/google/foster/bootblock.c
@@ -17,7 +17,7 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
#include <soc/clock.h>
diff --git a/src/mainboard/google/foster/pmic.c b/src/mainboard/google/foster/pmic.c
index 2eeccb2241..b73983b614 100644
--- a/src/mainboard/google/foster/pmic.c
+++ b/src/mainboard/google/foster/pmic.c
@@ -17,7 +17,7 @@
#include <boardid.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index 240a5493e8..77c185cb3d 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <ec/google/chromeec/ec.h>
#include <gpio.h>
#include <soc/bl31_plat_params.h>
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
index 98c6fb963e..92c0e1a443 100644
--- a/src/mainboard/google/nyan/bootblock.c
+++ b/src/mainboard/google/nyan/bootblock.c
@@ -16,7 +16,7 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <gpio.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index 5c56cbe36b..f115586b0f 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -17,7 +17,7 @@
#include <boardid.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
#include <reset.h>
diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c
index c10af7173a..dcc18146ea 100644
--- a/src/mainboard/google/nyan_big/bootblock.c
+++ b/src/mainboard/google/nyan_big/bootblock.c
@@ -16,7 +16,7 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <gpio.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index 2436febc87..77b6545341 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -17,7 +17,7 @@
#include <boardid.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
#include <reset.h>
diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c
index c10af7173a..dcc18146ea 100644
--- a/src/mainboard/google/nyan_blaze/bootblock.c
+++ b/src/mainboard/google/nyan_blaze/bootblock.c
@@ -16,7 +16,7 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <gpio.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index 2436febc87..77b6545341 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -17,7 +17,7 @@
#include <boardid.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
#include <reset.h>
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 4cc72f1ceb..14d3e2f51e 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <drivers/parade/ps8625/ps8625.h>
#include <ec/google/chromeec/ec.h>
#include <edid.h>
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
index 2bcf83672e..1268df2689 100644
--- a/src/mainboard/google/peach_pit/romstage.c
+++ b/src/mainboard/google/peach_pit/romstage.c
@@ -22,7 +22,7 @@
#include <cbmem.h>
#include <commonlib/region.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <drivers/maxim/max77802/max77802.h>
#include <program_loading.h>
#include <soc/clk.h>
diff --git a/src/mainboard/google/smaug/bootblock.c b/src/mainboard/google/smaug/bootblock.c
index 783705dffe..fd5d293b6c 100644
--- a/src/mainboard/google/smaug/bootblock.c
+++ b/src/mainboard/google/smaug/bootblock.c
@@ -16,7 +16,7 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
#include <soc/clock.h>
diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c
index 8c445d8365..c783ca4727 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -20,7 +20,7 @@
#include <boot/coreboot_tables.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <soc/addressmap.h>
#include <soc/clk_rst.h>
#include <soc/clock.h>
diff --git a/src/mainboard/google/smaug/pmic.c b/src/mainboard/google/smaug/pmic.c
index 25e870a123..77de277afa 100644
--- a/src/mainboard/google/smaug/pmic.c
+++ b/src/mainboard/google/smaug/pmic.c
@@ -17,7 +17,7 @@
#include <boardid.h>
#include <console/console.h>
#include <delay.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/mainboard/google/smaug/romstage.c b/src/mainboard/google/smaug/romstage.c
index 213fad7437..fd7c07f84d 100644
--- a/src/mainboard/google/smaug/romstage.c
+++ b/src/mainboard/google/smaug/romstage.c
@@ -15,7 +15,7 @@
#include <delay.h>
#include <soc/addressmap.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <soc/clock.h>
#include <soc/funitcfg.h>
#include <soc/nvidia/tegra/i2c.h>
diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c
index a6bbf881e3..15e2a574e8 100644
--- a/src/mainboard/google/veyron/mainboard.c
+++ b/src/mainboard/google/veyron/mainboard.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <edid.h>
#include <elog.h>
#include <gpio.h>
diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c
index ef085b2f07..26fcbb9467 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <edid.h>
#include <elog.h>
#include <gpio.h>
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index b9b6a2225a..91bf46a526 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -19,7 +19,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <device/i2c.h>
+#include <device/i2c_simple.h>
#include <edid.h>
#include <elog.h>
#include <gpio.h>