diff options
| -rw-r--r-- | src/cpu/samsung/exynos5-common/spl.h | 4 | ||||
| -rw-r--r-- | src/cpu/samsung/s5p-common/s3c24x0_i2c.c | 19 | ||||
| -rw-r--r-- | src/mainboard/google/snow/bootblock.c | 14 | ||||
| -rw-r--r-- | src/mainboard/google/snow/smdk5250_spl.c | 15 |
4 files changed, 1 insertions, 51 deletions
diff --git a/src/cpu/samsung/exynos5-common/spl.h b/src/cpu/samsung/exynos5-common/spl.h index 439e1b0383..afa9a8e909 100644 --- a/src/cpu/samsung/exynos5-common/spl.h +++ b/src/cpu/samsung/exynos5-common/spl.h @@ -91,8 +91,4 @@ struct spl_machine_param *spl_get_machine_params(void); */ void spl_early_init(void); -/* FIXME(dhendrix): for early i2c init */ -void board_i2c_release_bus(int node); -int board_i2c_claim_bus(int node); - #endif /* __ASM_ARCH_EXYNOS_SPL_H__ */ diff --git a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c index 0b6f7684b1..2940b09a54 100644 --- a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c +++ b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c @@ -39,9 +39,6 @@ #include "device/i2c.h" #include "s3c24x0_i2c.h" -/* for board_i2c_* */ -#include "cpu/samsung/exynos5-common/spl.h" - #define I2C_WRITE 0 #define I2C_READ 1 @@ -531,12 +528,7 @@ int i2c_probe(uchar chip) * address was <ACK>ed (i.e. there was a chip at that address which * drove the data line low). */ - if (board_i2c_claim_bus(i2c->node)) { - debug("I2C cannot claim bus %d\n", i2c->bus_num); - return -1; - } ret = i2c_transfer(i2c->regs, I2C_READ, chip << 1, 0, 0, buf, 1); - board_i2c_release_bus(i2c->node); return ret != I2C_OK; } @@ -578,13 +570,8 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) i2c = get_bus(g_current_bus); if (!i2c) return -1; - if (board_i2c_claim_bus(i2c->node)) { - debug("I2C cannot claim bus %d\n", i2c->bus_num); - return -1; - } ret = i2c_transfer(i2c->regs, I2C_READ, chip << 1, &xaddr[4 - alen], alen, buffer, len); - board_i2c_release_bus(i2c->node); if (ret) { debug("I2c read: failed %d\n", ret); return 1; @@ -628,13 +615,9 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) i2c = get_bus(g_current_bus); if (!i2c) return -1; - if (board_i2c_claim_bus(i2c->node)) { - debug("I2C cannot claim bus %d\n", i2c->bus_num); - return -1; - } + ret = i2c_transfer(i2c->regs, I2C_WRITE, chip << 1, &xaddr[4 - alen], alen, buffer, len); - board_i2c_release_bus(i2c->node); return ret != 0; } diff --git a/src/mainboard/google/snow/bootblock.c b/src/mainboard/google/snow/bootblock.c index fd3c505b1e..58d347d5a6 100644 --- a/src/mainboard/google/snow/bootblock.c +++ b/src/mainboard/google/snow/bootblock.c @@ -649,15 +649,8 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) #endif if (!i2c) return -1; -#if 0 - if (board_i2c_claim_bus(i2c->node)) { - debug("I2C cannot claim bus %d\n", i2c->bus_num); - return -1; - } -#endif ret = i2c_transfer(i2c->regs, I2C_READ, chip << 1, &xaddr[4 - alen], alen, buffer, len); - //board_i2c_release_bus(i2c->node); if (ret) { //debug("I2c read: failed %d\n", ret); return 1; @@ -702,15 +695,8 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) i2c = &i2c0; if (!i2c) return -1; -#if 0 - if (board_i2c_claim_bus(i2c->node)) { - //debug("I2C cannot claim bus %d\n", i2c->bus_num); - return -1; - } -#endif ret = i2c_transfer(i2c->regs, I2C_WRITE, chip << 1, &xaddr[4 - alen], alen, buffer, len); - //board_i2c_release_bus(i2c->node); return ret != 0; } diff --git a/src/mainboard/google/snow/smdk5250_spl.c b/src/mainboard/google/snow/smdk5250_spl.c index 0dbd4e1165..33f27b17db 100644 --- a/src/mainboard/google/snow/smdk5250_spl.c +++ b/src/mainboard/google/snow/smdk5250_spl.c @@ -87,18 +87,3 @@ int board_wakeup_permitted(void) return !is_bad_wake; } - -/* - * TODO(sjg@chromium.org): - * Declared there here for SPL, since there is no core i2c subsystem and - * cmd_i2c.c is not included. - */ -void board_i2c_release_bus(int node) -{ -} - -int board_i2c_claim_bus(int node) -{ - /* EC is not allowed to touch the bus until we enter U-Boot */ - return 0; -} |