summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cpu/allwinner/a10/twi.c40
-rw-r--r--src/drivers/i2c/tpm/tis.c5
-rw-r--r--src/drivers/i2c/tpm/tpm.c19
-rw-r--r--src/drivers/maxim/max77686/max77686.c4
-rw-r--r--src/drivers/parade/ps8625/ps8625.c3
-rw-r--r--src/drivers/ti/tps65090/tps65090.c4
-rw-r--r--src/drivers/xpowers/axp209/axp209.c4
-rw-r--r--src/ec/google/chromeec/ec_i2c.c4
-rw-r--r--src/include/device/i2c.h84
-rw-r--r--src/mainboard/google/daisy/mainboard.c1
-rw-r--r--src/mainboard/google/nyan/pmic.c2
-rw-r--r--src/mainboard/google/nyan_big/pmic.c2
-rw-r--r--src/mainboard/google/nyan_blaze/pmic.c2
-rw-r--r--src/mainboard/google/peach_pit/mainboard.c1
-rw-r--r--src/mainboard/google/peach_pit/romstage.c9
-rw-r--r--src/soc/nvidia/tegra/i2c.c34
-rw-r--r--src/soc/samsung/exynos5250/i2c.c447
-rw-r--r--src/soc/samsung/exynos5250/i2c.h16
-rw-r--r--src/soc/samsung/exynos5420/i2c.c906
-rw-r--r--src/soc/samsung/exynos5420/i2c.h54
20 files changed, 758 insertions, 883 deletions
diff --git a/src/cpu/allwinner/a10/twi.c b/src/cpu/allwinner/a10/twi.c
index 692a498a36..14e5ec7d9f 100644
--- a/src/cpu/allwinner/a10/twi.c
+++ b/src/cpu/allwinner/a10/twi.c
@@ -109,8 +109,8 @@ static void i2c_send_stop(struct a1x_twi *twi)
write32(reg32, &twi->ctl);
}
-int i2c_read(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len)
+static int i2c_read(unsigned bus, unsigned chip, unsigned addr,
+ uint8_t *buf, unsigned len)
{
unsigned count = len;
enum twi_status expected_status;
@@ -169,8 +169,8 @@ int i2c_read(unsigned bus, unsigned chip, unsigned addr,
return len;
}
-int i2c_write(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, const uint8_t *buf, unsigned len)
+static int i2c_write(unsigned bus, unsigned chip, unsigned addr,
+ const uint8_t *buf, unsigned len)
{
unsigned count = len;
struct a1x_twi *twi = (void *)TWI_BASE(bus);
@@ -204,3 +204,35 @@ int i2c_write(unsigned bus, unsigned chip, unsigned addr,
return len;
}
+
+
+/*
+ * This transfer function is not complete or correct, but it provides
+ * the basic support that the above read and write functions previously
+ * provided directly. It is extremely limited and not useful for
+ * advanced drivers like TPM.
+ *
+ * TODO: Rewite the i2c_transfer and supporting functions
+ *
+ */
+int i2c_transfer(unsigned bus, struct i2c_seg *segments, int count)
+{
+ struct i2c_seg *seg = segments;
+
+ if (seg->read) {
+ /* Read has one buf for the addr and one for the data */
+ if (count != 2)
+ return -1;
+
+ if(i2c_read(bus, seg->chip, *seg->buf, seg[1].buf, seg[1].len) < 0)
+ return -1;
+ } else {
+ /* Write buf has adder and data. */
+ if (count != 1)
+ return -1;
+
+ if(i2c_write(bus, seg->chip, *seg->buf, seg->buf+1, seg->len-1) < 0)
+ return -1;
+ }
+ return 0;
+}
diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c
index e8d69acfbf..49bcdd7049 100644
--- a/src/drivers/i2c/tpm/tis.c
+++ b/src/drivers/i2c/tpm/tis.c
@@ -79,10 +79,7 @@ int tis_init(void)
* Probe TPM twice; the first probing might fail because TPM is asleep,
* and the probing can wake up TPM.
*/
- uint8_t tmp = 0;
-
- if (i2c_write(bus, chip, 0, 1, &tmp, sizeof(tmp)) &&
- i2c_write(bus, chip, 0, 1, &tmp, sizeof(tmp)))
+ if (i2c_writeb(bus, chip, 0, 0) && i2c_writeb(bus, chip, 0, 0))
return -1;
return 0;
diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c
index 837bd234ac..6f6878969c 100644
--- a/src/drivers/i2c/tpm/tpm.c
+++ b/src/drivers/i2c/tpm/tpm.c
@@ -120,8 +120,7 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
if ((tpm_dev.chip_type == SLB9635) || (tpm_dev.chip_type == UNKNOWN)) {
/* slb9635 protocol should work in both cases */
for (count = 0; count < MAX_COUNT; count++) {
- rc = i2c_write(tpm_dev.bus, tpm_dev.addr,
- 0, 0, &addr, 1);
+ rc = i2c_write_raw(tpm_dev.bus, tpm_dev.addr, &addr, 1);
if (rc == 0)
break; /* success, break to skip sleep */
@@ -137,8 +136,8 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
*/
for (count = 0; count < MAX_COUNT; count++) {
udelay(SLEEP_DURATION);
- rc = i2c_read(tpm_dev.bus, tpm_dev.addr,
- 0, 0, buffer, len);
+ rc = i2c_read_raw(tpm_dev.bus, tpm_dev.addr,
+ buffer, len);
if (rc == 0)
break; /* success, break to skip sleep */
@@ -150,9 +149,13 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
* retries should usually not be needed, but are kept just to
* be safe on the safe side.
*/
+ struct i2c_seg aseg = { .read = 0, .chip = tpm_dev.addr,
+ .buf = &addr, .len = 1 };
+ struct i2c_seg dseg = { .read = 1, .chip = tpm_dev.addr,
+ .buf = buffer, .len = len };
for (count = 0; count < MAX_COUNT; count++) {
- rc = i2c_read(tpm_dev.bus, tpm_dev.addr,
- addr, 1, buffer, len);
+ rc = i2c_transfer(tpm_dev.bus, &aseg, 1) ||
+ i2c_transfer(tpm_dev.bus, &dseg, 1);
if (rc == 0)
break; /* break here to skip sleep */
udelay(SLEEP_DURATION);
@@ -186,8 +189,8 @@ static int iic_tpm_write_generic(uint8_t addr, uint8_t *buffer, size_t len,
if (!tpm_dev.bus)
return -1;
for (count = 0; count < max_count; count++) {
- rc = i2c_write(tpm_dev.bus, tpm_dev.addr, 0, 0,
- tpm_dev.buf, len + 1);
+ rc = i2c_write_raw(tpm_dev.bus, tpm_dev.addr,
+ tpm_dev.buf, len + 1);
if (rc == 0)
break; /* success, break to skip sleep */
diff --git a/src/drivers/maxim/max77686/max77686.c b/src/drivers/maxim/max77686/max77686.c
index adc1627430..e971dc504d 100644
--- a/src/drivers/maxim/max77686/max77686.c
+++ b/src/drivers/maxim/max77686/max77686.c
@@ -93,7 +93,7 @@ struct max77686_para max77686_param[] = {/*{vol_addr, vol_bitpos,
static inline int max77686_i2c_write(unsigned int bus, unsigned char chip_addr,
unsigned int reg, unsigned char val)
{
- return i2c_write(bus, chip_addr, reg, 1, &val, 1);
+ return i2c_writeb(bus, chip_addr, reg, val);
}
/*
@@ -107,7 +107,7 @@ static inline int max77686_i2c_write(unsigned int bus, unsigned char chip_addr,
static inline int max77686_i2c_read(unsigned int bus, unsigned char chip_addr,
unsigned int reg, unsigned char *val)
{
- return i2c_read(bus, chip_addr, reg, 1, val, 1);
+ return i2c_readb(bus, chip_addr, reg, (uint8_t *)val);
}
/*
diff --git a/src/drivers/parade/ps8625/ps8625.c b/src/drivers/parade/ps8625/ps8625.c
index 05219b0333..c673d3a3a5 100644
--- a/src/drivers/parade/ps8625/ps8625.c
+++ b/src/drivers/parade/ps8625/ps8625.c
@@ -31,7 +31,6 @@ void parade_ps8625_bridge_setup(unsigned bus, unsigned chip_base,
for (i = 0; i < parade_write_count; i++) {
const struct parade_write *w = &parade_writes[i];
- i2c_write(bus, chip_base + w->offset, w->reg, sizeof(w->reg),
- &w->val, sizeof(w->val));
+ i2c_writeb(bus, chip_base + w->offset, w->reg, w->val);
}
}
diff --git a/src/drivers/ti/tps65090/tps65090.c b/src/drivers/ti/tps65090/tps65090.c
index 653d20da24..35a050f36f 100644
--- a/src/drivers/ti/tps65090/tps65090.c
+++ b/src/drivers/ti/tps65090/tps65090.c
@@ -64,7 +64,7 @@ static int tps65090_i2c_write(unsigned int bus,
{
int ret;
- ret = i2c_write(bus, TPS65090_I2C_ADDR, reg_addr, 1, &value, 1);
+ ret = i2c_writeb(bus, TPS65090_I2C_ADDR, reg_addr, value);
printk(BIOS_DEBUG, "%s: reg=%#x, value=%#x, ret=%d\n",
__func__, reg_addr, value, ret);
return ret;
@@ -76,7 +76,7 @@ static int tps65090_i2c_read(unsigned int bus,
int ret;
printk(BIOS_DEBUG, "%s: reg=%#x, ", __func__, reg_addr);
- ret = i2c_read(bus, TPS65090_I2C_ADDR, reg_addr, 1, value, 1);
+ ret = i2c_readb(bus, TPS65090_I2C_ADDR, reg_addr, value);
if (ret)
printk(BIOS_DEBUG, "fail, ret=%d\n", ret);
else
diff --git a/src/drivers/xpowers/axp209/axp209.c b/src/drivers/xpowers/axp209/axp209.c
index 4f984e6b51..8aafd48ef0 100644
--- a/src/drivers/xpowers/axp209/axp209.c
+++ b/src/drivers/xpowers/axp209/axp209.c
@@ -47,12 +47,12 @@ enum registers {
*/
static int axp209_read(u8 bus, u8 reg, u8 *val)
{
- return i2c_read(bus, AXP209_I2C_ADDR, reg, 1, val, 1);
+ return i2c_readb(bus, AXP209_I2C_ADDR, reg, val);
}
static int axp209_write(u8 bus, u8 reg, u8 val)
{
- return i2c_write(bus, AXP209_I2C_ADDR, reg, 1, &val, 1);
+ return i2c_writeb(bus, AXP209_I2C_ADDR, reg, val);
}
/**
diff --git a/src/ec/google/chromeec/ec_i2c.c b/src/ec/google/chromeec/ec_i2c.c
index da11a9612d..551c3b9a87 100644
--- a/src/ec/google/chromeec/ec_i2c.c
+++ b/src/ec/google/chromeec/ec_i2c.c
@@ -116,13 +116,13 @@ int google_chromeec_command(struct chromeec_command *cec_command)
/* Start I2C communication */
i2c_dump(bus, chip, (const uint8_t *)&cmd, size_i2c_cmd);
- if (i2c_write(bus, chip, 0, 0, (uint8_t *)&cmd, size_i2c_cmd) != 0) {
+ if (i2c_write_raw(bus, chip, (uint8_t *)&cmd, size_i2c_cmd) != 0) {
printk(BIOS_ERR, "%s: Cannot complete write to i2c-%d:%#x\n",
__func__, bus, chip);
cec_command->cmd_code = EC_RES_ERROR;
return 1;
}
- if (i2c_read(bus, chip, 0, 0, (uint8_t *)&resp, size_i2c_resp) != 0) {
+ if (i2c_read_raw(bus, chip, (uint8_t *)&resp, size_i2c_resp) != 0) {
printk(BIOS_ERR, "%s: Cannot complete read from i2c-%d:%#x\n",
__func__, bus, chip);
cec_command->cmd_code = EC_RES_ERROR;
diff --git a/src/include/device/i2c.h b/src/include/device/i2c.h
index 997d201341..da9d1bcb3c 100644
--- a/src/include/device/i2c.h
+++ b/src/include/device/i2c.h
@@ -1,7 +1,7 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2013 Google, Inc.
+ * Copyright (C) 2014 Google, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,11 +21,83 @@
#define _DEVICE_I2C_H_
#include <stdint.h>
+#include <stdlib.h>
-/* note: chip is the 7-bit I2C address */
-int i2c_read(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len);
-int i2c_write(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, const uint8_t *buf, unsigned len);
+struct i2c_seg
+{
+ int read;
+ uint8_t chip;
+ uint8_t *buf;
+ int len;
+};
+
+int i2c_transfer(unsigned bus, struct i2c_seg *segments, int count);
+
+/*
+ * Read a raw chunk of data in one segment and one frame.
+ *
+ * [start][slave addr][r][data][stop]
+ */
+static inline int i2c_read_raw(unsigned bus, uint8_t chip, uint8_t *data,
+ int len)
+{
+ struct i2c_seg seg =
+ { .read = 1, .chip = chip, .buf = data, .len = len };
+ return i2c_transfer(bus, &seg, 1);
+}
+
+/*
+ * Write a raw chunk of data in one segment and one frame.
+ *
+ * [start][slave addr][w][data][stop]
+ */
+static inline int i2c_write_raw(unsigned bus, uint8_t chip, uint8_t *data,
+ int len)
+{
+ struct i2c_seg seg =
+ { .read = 0, .chip = chip, .buf = data, .len = len };
+ return i2c_transfer(bus, &seg, 1);
+}
+
+/**
+ * Read a byte with two segments in one frame
+ *
+ * [start][slave addr][w][register addr][start][slave addr][r][data][stop]
+ */
+static inline int i2c_readb(unsigned bus, uint8_t chip, uint8_t reg,
+ uint8_t *data)
+{
+ struct i2c_seg seg[2];
+
+ seg[0].read = 0;
+ seg[0].chip = chip;
+ seg[0].buf = &reg;
+ seg[0].len = 1;
+ seg[1].read = 1;
+ seg[1].chip = chip;
+ seg[1].buf = data;
+ seg[1].len = 1;
+
+ return i2c_transfer(bus, seg, ARRAY_SIZE(seg));
+}
+
+/**
+ * Write a byte with one segment in one frame.
+ *
+ * [start][slave addr][w][register addr][data][stop]
+ */
+static inline int i2c_writeb(unsigned bus, uint8_t chip, uint8_t reg,
+ uint8_t data)
+{
+ struct i2c_seg seg;
+ uint8_t buf[] = {reg, data};
+
+ seg.read = 0;
+ seg.chip = chip;
+ seg.buf = buf;
+ seg.len = ARRAY_SIZE(buf);
+
+ return i2c_transfer(bus, &seg, 1);
+}
#endif /* _DEVICE_I2C_H_ */
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 8a252b1a19..cf25967851 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -34,6 +34,7 @@
#include <soc/samsung/exynos5250/i2c.h>
#include <soc/samsung/exynos5250/dp-core.h>
#include <soc/samsung/exynos5250/dp.h>
+#include <soc/samsung/exynos5250/periph.h>
#include <soc/samsung/exynos5250/usb.h>
#include "exynos5250.h"
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index cea872602a..7ec9290fd9 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -59,7 +59,7 @@ static struct as3722_init_reg init_list[] = {
static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
{
- i2c_write(bus, AS3722_I2C_ADDR, reg, 1, &val, 1);
+ i2c_writeb(bus, AS3722_I2C_ADDR, reg, val);
if (do_delay)
udelay(500);
}
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index a6f6912a62..9f3f81a985 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -59,7 +59,7 @@ static struct as3722_init_reg init_list[] = {
static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
{
- i2c_write(bus, AS3722_I2C_ADDR, reg, 1, &val, 1);
+ i2c_writeb(bus, AS3722_I2C_ADDR, reg, val);
if (do_delay)
udelay(500);
}
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index a6f6912a62..9f3f81a985 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -59,7 +59,7 @@ static struct as3722_init_reg init_list[] = {
static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
{
- i2c_write(bus, AS3722_I2C_ADDR, reg, 1, &val, 1);
+ i2c_writeb(bus, AS3722_I2C_ADDR, reg, val);
if (do_delay)
udelay(500);
}
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 706447ae92..01d19bc4aa 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -32,6 +32,7 @@
#include <soc/samsung/exynos5420/cpu.h>
#include <soc/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/power.h>
+#include <soc/samsung/exynos5420/periph.h>
#include <soc/samsung/exynos5420/i2c.h>
#include <soc/samsung/exynos5420/dp.h>
#include <soc/samsung/exynos5420/fimd.h>
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
index 16dc997e75..248809d1a2 100644
--- a/src/mainboard/google/peach_pit/romstage.c
+++ b/src/mainboard/google/peach_pit/romstage.c
@@ -97,13 +97,10 @@ static int setup_power(int is_resume)
uint8_t reg = pmic_writes[i].reg;
if (pmic_writes[i].or_orig)
- error |= i2c_read(4, MAX77802_I2C_ADDR,
- reg, sizeof(reg),
- &data, sizeof(data));
+ error |= i2c_readb(4, MAX77802_I2C_ADDR, reg, &data);
+
data |= pmic_writes[i].val;
- error |= i2c_write(4, MAX77802_I2C_ADDR,
- reg, sizeof(reg),
- &data, sizeof(data));
+ error |= i2c_writeb(4, MAX77802_I2C_ADDR, reg, data);
}
return error;
diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c
index 8c8a372798..9a4d71bc3c 100644
--- a/src/soc/nvidia/tegra/i2c.c
+++ b/src/soc/nvidia/tegra/i2c.c
@@ -130,43 +130,35 @@ static int tegra_i2c_request(int bus, unsigned chip, int cont, int restart,
data, data_len);
}
-static int i2c_readwrite(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len, int read)
+static int i2c_transfer_segment(unsigned bus, unsigned chip, int restart,
+ int read, void *buf, int len)
{
const uint32_t max_payload =
(IOHEADER_PAYLOADSIZE_MASK + 1) >> IOHEADER_PAYLOADSIZE_SHIFT;
- uint8_t abuf[sizeof(addr)];
-
- int i;
- for (i = 0; i < alen; i++)
- abuf[i] = addr >> ((alen - i - 1) * 8);
-
- if (tegra_i2c_request(bus, chip, !read, 0, 0, abuf, alen))
- return -1;
while (len) {
int todo = MIN(len, max_payload);
int cont = (todo < len);
- if (tegra_i2c_request(bus, chip, cont, 0, read, buf, todo)) {
- // We should reset the controller here.
+ if (tegra_i2c_request(bus, chip, cont, restart,
+ read, buf, todo))
return -1;
- }
len -= todo;
buf += todo;
}
return 0;
}
-int i2c_read(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len)
+int i2c_transfer(unsigned bus, struct i2c_seg *segments, int count)
{
- return i2c_readwrite(bus, chip, addr, alen, buf, len, 1);
-}
+ struct i2c_seg *seg = segments;
-int i2c_write(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, const uint8_t *buf, unsigned len)
-{
- return i2c_readwrite(bus, chip, addr, alen, (void *)buf, len, 0);
+ int i;
+ for (i = 0; i < count; seg++, i++) {
+ if (i2c_transfer_segment(bus, seg->chip, i < count - 1,
+ seg->read, seg->buf, seg->len))
+ return -1;
+ }
+ return 0;
}
void i2c_init(unsigned bus)
diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c
index e83ab57014..d5d83b393a 100644
--- a/src/soc/samsung/exynos5250/i2c.c
+++ b/src/soc/samsung/exynos5250/i2c.c
@@ -18,386 +18,279 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <assert.h>
#include <console/console.h>
#include <delay.h>
#include <arch/io.h>
#include <device/i2c.h>
#include "clk.h"
#include "i2c.h"
+#include "periph.h"
+
+struct __attribute__ ((packed)) i2c_regs
+{
+ uint8_t con;
+ uint8_t _1[3];
+ uint8_t stat;
+ uint8_t _2[3];
+ uint8_t add;
+ uint8_t _3[3];
+ uint8_t ds;
+ uint8_t _4[3];
+ uint8_t lc;
+ uint8_t _5[3];
+};
+
+struct s3c24x0_i2c_bus {
+ int bus_num;
+ struct i2c_regs *regs;
+ enum periph_id periph_id;
+};
-#define I2C_WRITE 0
-#define I2C_READ 1
-
-#define I2C_OK 0
-#define I2C_NOK 1
-#define I2C_NACK 2
-#define I2C_NOK_LA 3 /* Lost arbitration */
-#define I2C_NOK_TOUT 4 /* time out */
-
-#define I2CSTAT_BSY 0x20 /* Busy bit */
-#define I2CSTAT_NACK 0x01 /* Nack bit */
-#define I2CCON_ACKGEN 0x80 /* Acknowledge generation */
-#define I2CCON_IRPND 0x10 /* Interrupt pending bit */
-#define I2C_MODE_MT 0xC0 /* Master Transmit Mode */
-#define I2C_MODE_MR 0x80 /* Master Receive Mode */
-#define I2C_START_STOP 0x20 /* START / STOP */
-#define I2C_TXRX_ENA 0x10 /* I2C Tx/Rx enable */
-
-/* The timeouts we live by */
enum {
- I2C_XFER_TIMEOUT_MS = 35, /* xfer to complete */
- I2C_INIT_TIMEOUT_MS = 1000, /* bus free on init */
- I2C_IDLE_TIMEOUT_MS = 100, /* waiting for bus idle */
- I2C_STOP_TIMEOUT_US = 200, /* waiting for stop events */
+ I2cConIntPending = 0x1 << 4,
+ I2cConIntEn = 0x1 << 5,
+ I2cConAckGen = 0x1 << 7
};
-static struct s3c24x0_i2c_bus i2c_buses[] = {
+enum {
+ I2cStatAck = 0x1 << 0,
+ I2cStatAddrZero = 0x1 << 1,
+ I2cStatAddrSlave = 0x1 << 2,
+ I2cStatArb = 0x1 << 3,
+ I2cStatEnable = 0x1 << 4,
+ I2cStatStartStop = 0x1 << 5,
+ I2cStatBusy = 0x1 << 5,
+
+ I2cStatModeMask = 0x3 << 6,
+ I2cStatSlaveRecv = 0x0 << 6,
+ I2cStatSlaveXmit = 0x1 << 6,
+ I2cStatMasterRecv = 0x2 << 6,
+ I2cStatMasterXmit = 0x3 << 6
+};
+
+static struct s3c24x0_i2c_bus i2c_busses[] = {
{
.bus_num = 0,
- .regs = (struct s3c24x0_i2c *)0x12c60000,
+ .regs = (void *)0x12c60000,
.periph_id = PERIPH_ID_I2C0,
},
{
.bus_num = 1,
- .regs = (struct s3c24x0_i2c *)0x12c70000,
+ .regs = (void *)0x12c70000,
.periph_id = PERIPH_ID_I2C1,
},
{
.bus_num = 2,
- .regs = (struct s3c24x0_i2c *)0x12c80000,
+ .regs = (void *)0x12c80000,
.periph_id = PERIPH_ID_I2C2,
},
{
.bus_num = 3,
- .regs = (struct s3c24x0_i2c *)0x12c90000,
+ .regs = (void *)0x12c90000,
.periph_id = PERIPH_ID_I2C3,
},
{
.bus_num = 4,
- .regs = (struct s3c24x0_i2c *)0x12ca0000,
+ .regs = (void *)0x12ca0000,
.periph_id = PERIPH_ID_I2C4,
},
{
.bus_num = 5,
- .regs = (struct s3c24x0_i2c *)0x12cb0000,
+ .regs = (void *)0x12cb0000,
.periph_id = PERIPH_ID_I2C5,
},
{
.bus_num = 6,
- .regs = (struct s3c24x0_i2c *)0x12cc0000,
+ .regs = (void *)0x12cc0000,
.periph_id = PERIPH_ID_I2C6,
},
{
.bus_num = 7,
- .regs = (struct s3c24x0_i2c *)0x12cd0000,
+ .regs = (void *)0x12cd0000,
.periph_id = PERIPH_ID_I2C7,
},
};
-static int WaitForXfer(struct s3c24x0_i2c *i2c)
-{
- int i;
- i = I2C_XFER_TIMEOUT_MS * 20;
- while (!(readl(&i2c->iiccon) & I2CCON_IRPND)) {
- if (i == 0) {
- printk(BIOS_ERR, "%s: i2c xfer timeout\n", __func__);
- return I2C_NOK_TOUT;
- }
- udelay(50);
- i--;
- }
- return I2C_OK;
-}
-static int IsACK(struct s3c24x0_i2c *i2c)
+static int i2c_int_pending(struct i2c_regs *regs)
{
- return !(readl(&i2c->iicstat) & I2CSTAT_NACK);
+ return readb(&regs->con) & I2cConIntPending;
}
-static void ReadWriteByte(struct s3c24x0_i2c *i2c)
+static void i2c_clear_int(struct i2c_regs *regs)
{
- uint32_t x;
-
- x = readl(&i2c->iiccon);
- writel(x & ~I2CCON_IRPND, &i2c->iiccon);
+ writeb(readb(&regs->con) & ~I2cConIntPending, &regs->con);
}
-static void i2c_ch_init(struct s3c24x0_i2c_bus *bus, int speed, int slaveadd)
+static void i2c_ack_enable(struct i2c_regs *regs)
{
- unsigned long freq, pres = 16, div;
- unsigned long val;
-
- freq = clock_get_periph_rate(bus->periph_id);
- /* calculate prescaler and divisor values */
- if ((freq / pres / (16 + 1)) > speed)
- /* set prescaler to 512 */
- pres = 512;
-
- div = 0;
-
- while ((freq / pres / (div + 1)) > speed)
- div++;
-
- /* set prescaler, divisor according to freq, also set ACKGEN, IRQ */
- val = (div & 0x0F) | 0xA0 | ((pres == 512) ? 0x40 : 0);
- writel(val, &bus->regs->iiccon);
+ writeb(readb(&regs->con) | I2cConAckGen, &regs->con);
+}
- /* init to SLAVE RECEIVE mode and clear I2CADDn */
- writel(0, &bus->regs->iicstat);
- writel(slaveadd, &bus->regs->iicadd);
- /* program Master Transmit (and implicit STOP) */
- writel(I2C_MODE_MT | I2C_TXRX_ENA, &bus->regs->iicstat);
+static void i2c_ack_disable(struct i2c_regs *regs)
+{
+ writeb(readb(&regs->con) & ~I2cConAckGen, &regs->con);
}
-/*
- * MULTI BUS I2C support
- */
-static void i2c_bus_init(struct s3c24x0_i2c_bus *bus, int speed, int slaveadd)
+static int i2c_got_ack(struct i2c_regs *regs)
{
- i2c_ch_init(bus, speed, slaveadd);
+ return !(readb(&regs->stat) & I2cStatAck);
}
-/*
- * Verify the whether I2C ACK was received or not
- *
- * @param i2c pointer to I2C register base
- * @param buf array of data
- * @param len length of data
- * return I2C_OK when transmission done
- * I2C_NACK otherwise
- */
-static int i2c_send_verify(struct s3c24x0_i2c *i2c, unsigned char buf[],
- unsigned char len)
+static int i2c_wait_for_idle(struct i2c_regs *regs)
{
- int i, result = I2C_OK;
-
- if (IsACK(i2c)) {
- for (i = 0; (i < len) && (result == I2C_OK); i++) {
- writel(buf[i], &i2c->iicds);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- if (result == I2C_OK && !IsACK(i2c))
- result = I2C_NACK;
- }
- } else {
- result = I2C_NACK;
+ int timeout = 1000 * 100; // 1s.
+ while (timeout--) {
+ if (!(readb(&regs->stat) & I2cStatBusy))
+ return 0;
+ udelay(10);
}
-
- return result;
+ printk(BIOS_ERR, "I2C timeout waiting for idle.\n");
+ return 1;
}
-void i2c_init(unsigned bus_num, int speed, int slaveadd)
+static int i2c_wait_for_int(struct i2c_regs *regs)
{
- struct s3c24x0_i2c_bus *i2c;
- int i;
+ int timeout = 1000 * 100; // 1s.
+ while (timeout--) {
+ if (i2c_int_pending(regs))
+ return 0;
+ udelay(10);
+ }
+ printk(BIOS_ERR, "I2C timeout waiting for I2C interrupt.\n");
+ return 1;
+}
+
- i2c = &i2c_buses[bus_num];
- i2c_bus_init(i2c, speed, slaveadd);
- /* wait for some time to give previous transfer a chance to finish */
- i = I2C_INIT_TIMEOUT_MS * 20;
- while ((readl(&i2c->regs->iicstat) & I2CSTAT_BSY) && (i > 0)) {
- udelay(50);
- i--;
- }
- i2c_ch_init(i2c, speed, slaveadd);
+static int i2c_send_stop(struct i2c_regs *regs)
+{
+ uint8_t mode = readb(&regs->stat) & (I2cStatModeMask);
+ writeb(mode | I2cStatEnable, &regs->stat);
+ i2c_clear_int(regs);
+ return i2c_wait_for_idle(regs);
}
-/*
- * Send a STOP event and wait for it to have completed
- *
- * @param mode If it is a master transmitter or receiver
- * @return I2C_OK if the line became idle before timeout I2C_NOK_TOUT otherwise
- */
-static int i2c_send_stop(struct s3c24x0_i2c *i2c, int mode)
+static int i2c_send_start(struct i2c_regs *regs, int read, int chip)
{
- int timeout;
+ writeb(chip << 1, &regs->ds);
+ uint8_t mode = read ? I2cStatMasterRecv : I2cStatMasterXmit;
+ writeb(mode | I2cStatStartStop | I2cStatEnable, &regs->stat);
+ i2c_clear_int(regs);
- /* Setting the STOP event to fire */
- writel(mode | I2C_TXRX_ENA, &i2c->iicstat);
- ReadWriteByte(i2c);
+ if (i2c_wait_for_int(regs))
+ return 1;
- /* Wait for the STOP to send and the bus to go idle */
- for (timeout = I2C_STOP_TIMEOUT_US; timeout > 0; timeout -= 5) {
- if (!(readl(&i2c->iicstat) & I2CSTAT_BSY))
- return I2C_OK;
- udelay(5);
+ if (!i2c_got_ack(regs)) {
+ // Nobody home, but they may just be asleep.
+ return 1;
}
- return I2C_NOK_TOUT;
+ return 0;
}
-/*
- * cmd_type is 0 for write, 1 for read.
- *
- * addr_len can take any value from 0-255, it is only limited
- * by the char, we could make it larger if needed. If it is
- * 0 we skip the address write cycle.
- */
-static int i2c_transfer(struct s3c24x0_i2c *i2c,
- unsigned char cmd_type,
- unsigned char chip,
- unsigned char addr[],
- unsigned char addr_len,
- unsigned char data[],
- unsigned short data_len)
+static int i2c_xmit_buf(struct i2c_regs *regs, uint8_t *data, int len)
{
- int i, result, stop_bit_result;
- uint32_t x;
+ ASSERT(len);
- if (data == 0 || data_len == 0) {
- /* Don't support data transfer of no length or to address 0 */
- printk(BIOS_ERR, "i2c_transfer: bad call\n");
- return I2C_NOK;
- }
+ i2c_ack_enable(regs);
- /* Check I2C bus idle */
- i = I2C_IDLE_TIMEOUT_MS * 20;
- while ((readl(&i2c->iicstat) & I2CSTAT_BSY) && (i > 0)) {
- udelay(50);
- i--;
- }
-
- if (readl(&i2c->iicstat) & I2CSTAT_BSY) {
- printk(BIOS_ERR, "%s: bus busy\n", __func__);
- return I2C_NOK_TOUT;
- }
+ int i;
+ for (i = 0; i < len; i++) {
+ writeb(data[i], &regs->ds);
- x = readl(&i2c->iiccon);
- writel(x | I2CCON_ACKGEN, &i2c->iiccon);
+ i2c_clear_int(regs);
+ if (i2c_wait_for_int(regs))
+ return 1;
- if (addr && addr_len) {
- writel(chip, &i2c->iicds);
- /* send START */
- writel(I2C_MODE_MT | I2C_TXRX_ENA | I2C_START_STOP,
- &i2c->iicstat);
- if (WaitForXfer(i2c) == I2C_OK)
- result = i2c_send_verify(i2c, addr, addr_len);
- else
- result = I2C_NACK;
- } else
- result = I2C_NACK;
-
- switch (cmd_type) {
- case I2C_WRITE:
- if (result == I2C_OK)
- result = i2c_send_verify(i2c, data, data_len);
- else {
- writel(chip, &i2c->iicds);
- /* send START */
- writel(I2C_MODE_MT | I2C_TXRX_ENA | I2C_START_STOP,
- &i2c->iicstat);
- if (WaitForXfer(i2c) == I2C_OK)
- result = i2c_send_verify(i2c, data, data_len);
+ if (!i2c_got_ack(regs)) {
+ printk(BIOS_INFO, "I2c nacked.\n");
+ return 1;
}
+ }
- if (result == I2C_OK)
- result = WaitForXfer(i2c);
+ return 0;
+}
- stop_bit_result = i2c_send_stop(i2c, I2C_MODE_MT);
- break;
+static int i2c_recv_buf(struct i2c_regs *regs, uint8_t *data, int len)
+{
+ ASSERT(len);
- case I2C_READ:
- {
- int was_ok = (result == I2C_OK);
-
- writel(chip, &i2c->iicds);
- /* resend START */
- writel(I2C_MODE_MR | I2C_TXRX_ENA |
- I2C_START_STOP, &i2c->iicstat);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
-
- if (was_ok || IsACK(i2c)) {
- i = 0;
- while ((i < data_len) && (result == I2C_OK)) {
- /* disable ACK for final READ */
- if (i == data_len - 1) {
- x = readl(&i2c->iiccon) & ~I2CCON_ACKGEN;
- writel(x, &i2c->iiccon);
- }
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- data[i] = readl(&i2c->iicds);
- i++;
- }
- } else {
- result = I2C_NACK;
- }
+ i2c_ack_enable(regs);
- stop_bit_result = i2c_send_stop(i2c, I2C_MODE_MR);
- break;
- }
+ int i;
+ for (i = 0; i < len; i++) {
+ if (i == len - 1)
+ i2c_ack_disable(regs);
+
+ i2c_clear_int(regs);
+ if (i2c_wait_for_int(regs))
+ return 1;
- default:
- printk(BIOS_ERR, "i2c_transfer: bad call\n");
- result = stop_bit_result = I2C_NOK;
- break;
+ data[i] = readb(&regs->ds);
}
- /*
- * If the transmission went fine, then only the stop bit was left to
- * fail. Otherwise, the real failure we're interested in came before
- * that, during the actual transmission.
- */
- return (result == I2C_OK) ? stop_bit_result : result;
+ return 0;
}
-int i2c_read(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len)
+int i2c_transfer(unsigned bus, struct i2c_seg *segments, int seg_count)
{
- struct s3c24x0_i2c_bus *i2c;
- unsigned char xaddr[4];
- int ret;
+ struct s3c24x0_i2c_bus *i2c = &i2c_busses[bus];
+ struct i2c_regs *regs = i2c->regs;
+ int res = 0;
- if (alen > 4) {
- printk(BIOS_ERR, "I2C read: addr len %d not supported\n", alen);
+ if (!regs || i2c_wait_for_idle(regs))
return 1;
- }
- if (alen > 0) {
- xaddr[0] = (addr >> 24) & 0xFF;
- xaddr[1] = (addr >> 16) & 0xFF;
- xaddr[2] = (addr >> 8) & 0xFF;
- xaddr[3] = addr & 0xFF;
- }
+ writeb(I2cStatMasterXmit | I2cStatEnable, &regs->stat);
- i2c = &i2c_buses[bus];
- ret = i2c_transfer(i2c->regs, I2C_READ, chip << 1, &xaddr[4 - alen],
- alen, buf, len);
- if (ret) {
- printk(BIOS_ERR, "I2c read: failed %d\n", ret);
- return 1;
+ int i;
+ for (i = 0; i < seg_count; i++) {
+ struct i2c_seg *seg = &segments[i];
+
+ res = i2c_send_start(regs, seg->read, seg->chip);
+ if (res)
+ break;
+ if (seg->read)
+ res = i2c_recv_buf(regs, seg->buf, seg->len);
+ else
+ res = i2c_xmit_buf(regs, seg->buf, seg->len);
+ if (res)
+ break;
}
- return 0;
+
+ return i2c_send_stop(regs) || res;
}
-int i2c_write(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, const uint8_t *buf, unsigned len)
+void i2c_init(unsigned bus, int speed, int slaveadd)
{
- struct s3c24x0_i2c_bus *i2c;
- unsigned char xaddr[4];
- int ret;
+ struct s3c24x0_i2c_bus *i2c = &i2c_busses[bus];
- if (alen > 4) {
- printk(BIOS_ERR, "I2C write: addr len %d not supported\n",
- alen);
- return 1;
- }
+ unsigned long freq, pres = 16, div;
+ unsigned long val;
- if (alen > 0) {
- xaddr[0] = (addr >> 24) & 0xFF;
- xaddr[1] = (addr >> 16) & 0xFF;
- xaddr[2] = (addr >> 8) & 0xFF;
- xaddr[3] = addr & 0xFF;
- }
+ freq = clock_get_periph_rate(i2c->periph_id);
+ // Calculate prescaler and divisor values.
+ if ((freq / pres / (16 + 1)) > speed)
+ /* set prescaler to 512 */
+ pres = 512;
+
+ div = 0;
+
+ while ((freq / pres / (div + 1)) > speed)
+ div++;
- i2c = &i2c_buses[bus];
- ret = i2c_transfer(i2c->regs, I2C_WRITE, chip << 1, &xaddr[4 - alen],
- alen, (void *)buf, len);
+ // Set prescaler, divisor according to freq, also set ACKGEN, IRQ.
+ val = (div & 0x0f) | 0xa0 | ((pres == 512) ? 0x40 : 0);
+ writel(val, &i2c->regs->con);
- return ret != 0;
+ // Init to SLAVE RECEIVE mode and clear I2CADDn.
+ writel(0, &i2c->regs->stat);
+ writel(slaveadd, &i2c->regs->add);
+ // program Master Transmit (and implicit STOP).
+ writel(I2cStatMasterXmit | I2cStatEnable, &i2c->regs->stat);
}
diff --git a/src/soc/samsung/exynos5250/i2c.h b/src/soc/samsung/exynos5250/i2c.h
index a1d8bc1dcd..af4f2160ab 100644
--- a/src/soc/samsung/exynos5250/i2c.h
+++ b/src/soc/samsung/exynos5250/i2c.h
@@ -20,22 +20,6 @@
#ifndef CPU_SAMSUNG_EXYNOS5250_I2C_H
#define CPU_SAMSUNG_EXYNOS5250_I2C_H
-#include "periph.h"
-
-struct s3c24x0_i2c {
- u32 iiccon;
- u32 iicstat;
- u32 iicadd;
- u32 iicds;
- u32 iiclc;
-};
-
-struct s3c24x0_i2c_bus {
- int bus_num;
- struct s3c24x0_i2c *regs;
- enum periph_id periph_id;
-};
-
void i2c_init(unsigned bus, int speed, int slaveadd);
#endif /* CPU_SAMSUNG_EXYNOS5250_I2C_H */
diff --git a/src/soc/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c
index 6ca0087e5b..b79f9144a9 100644
--- a/src/soc/samsung/exynos5420/i2c.c
+++ b/src/soc/samsung/exynos5420/i2c.c
@@ -18,341 +18,363 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <arch/io.h>
+#include <assert.h>
#include <console/console.h>
#include <delay.h>
-#include <timer.h>
-#include <arch/io.h>
#include <device/i2c.h>
+#include <timer.h>
+#include <stddef.h>
#include "clk.h"
#include "i2c.h"
+#include "periph.h"
#include "pinmux.h"
-#define I2C_WRITE 0
-#define I2C_READ 1
-
-#define I2C_OK 0
-#define I2C_NOK 1
-#define I2C_NACK 2
-#define I2C_NOK_LA 3 /* Lost arbitration */
-#define I2C_NOK_TOUT 4 /* time out */
-
-/* HSI2C specific register description */
-
-/* I2C_CTL Register bits */
-/* FIXME(dhendrix): do we really need to cast these as unsigned? */
-#define HSI2C_FUNC_MODE_I2C (1u << 0)
-#define HSI2C_MASTER (1u << 3)
-#define HSI2C_RXCHON (1u << 6) /* Write/Send */
-#define HSI2C_TXCHON (1u << 7) /* Read/Receive */
-#define HSI2C_SW_RST (1u << 31)
-
-/* I2C_FIFO_STAT Register bits */
-#define HSI2C_TX_FIFO_LEVEL (0x7f << 0)
-#define HSI2C_TX_FIFO_FULL (1u << 7)
-#define HSI2C_TX_FIFO_EMPTY (1u << 8)
-#define HSI2C_RX_FIFO_LEVEL (0x7f << 16)
-#define HSI2C_RX_FIFO_FULL (1u << 23)
-#define HSI2C_RX_FIFO_EMPTY (1u << 24)
-
-/* I2C_FIFO_CTL Register bits */
-#define HSI2C_RXFIFO_EN (1u << 0)
-#define HSI2C_TXFIFO_EN (1u << 1)
-#define HSI2C_TXFIFO_TRIGGER_LEVEL (0x20 << 16)
-#define HSI2C_RXFIFO_TRIGGER_LEVEL (0x20 << 4)
-
-/* I2C_TRAILING_CTL Register bits */
-#define HSI2C_TRAILING_COUNT (0xff)
-
-/* I2C_INT_EN Register bits */
-#define HSI2C_INT_TX_ALMOSTEMPTY_EN (1u << 0)
-#define HSI2C_INT_RX_ALMOSTFULL_EN (1u << 1)
-#define HSI2C_INT_TRAILING_EN (1u << 6)
-#define HSI2C_INT_I2C_EN (1u << 9)
-
-/* I2C_CONF Register bits */
-#define HSI2C_AUTO_MODE (1u << 31)
-#define HSI2C_10BIT_ADDR_MODE (1u << 30)
-#define HSI2C_HS_MODE (1u << 29)
-
-/* I2C_AUTO_CONF Register bits */
-#define HSI2C_READ_WRITE (1u << 16)
-#define HSI2C_STOP_AFTER_TRANS (1u << 17)
-#define HSI2C_MASTER_RUN (1u << 31)
-
-/* I2C_TIMEOUT Register bits */
-#define HSI2C_TIMEOUT_EN (1u << 31)
-
-/* I2C_TRANS_STATUS register bits */
-#define HSI2C_MASTER_BUSY (1u << 17)
-#define HSI2C_SLAVE_BUSY (1u << 16)
-#define HSI2C_TIMEOUT_AUTO (1u << 4)
-#define HSI2C_NO_DEV (1u << 3)
-#define HSI2C_NO_DEV_ACK (1u << 2)
-#define HSI2C_TRANS_ABORT (1u << 1)
-#define HSI2C_TRANS_DONE (1u << 0)
-
-#define HSI2C_SLV_ADDR_MAS(x) ((x & 0x3ff) << 10)
-
-/* S3C I2C Controller bits */
-#define I2CSTAT_BSY 0x20 /* Busy bit */
-#define I2CSTAT_NACK 0x01 /* Nack bit */
-#define I2CCON_ACKGEN 0x80 /* Acknowledge generation */
-#define I2CCON_IRPND 0x10 /* Interrupt pending bit */
-#define I2C_MODE_MT 0xC0 /* Master Transmit Mode */
-#define I2C_MODE_MR 0x80 /* Master Receive Mode */
-#define I2C_START_STOP 0x20 /* START / STOP */
-#define I2C_TXRX_ENA 0x10 /* I2C Tx/Rx enable */
-
-#define I2C_TIMEOUT_MS 1000 /* 1 second */
+struct __attribute__ ((packed)) i2c_regs
+{
+ uint8_t con;
+ uint8_t _1[3];
+ uint8_t stat;
+ uint8_t _2[3];
+ uint8_t add;
+ uint8_t _3[3];
+ uint8_t ds;
+ uint8_t _4[3];
+ uint8_t lc;
+ uint8_t _5[3];
+};
-#define HSI2C_TIMEOUT 100
+struct __attribute__ ((packed)) hsi2c_regs
+{
+ uint32_t usi_ctl;
+ uint32_t usi_fifo_ctl;
+ uint32_t usi_trailing_ctl;
+ uint32_t usi_clk_ctl;
+ uint32_t usi_clk_slot;
+ uint32_t spi_ctl;
+ uint32_t uart_ctl;
+ uint32_t res1;
+ uint32_t usi_int_en;
+ uint32_t usi_int_stat;
+ uint32_t modem_stat;
+ uint32_t error_stat;
+ uint32_t usi_fifo_stat;
+ uint32_t usi_txdata;
+ uint32_t usi_rxdata;
+ uint32_t res2;
+ uint32_t i2c_conf;
+ uint32_t i2c_auto_conf;
+ uint32_t i2c_timeout;
+ uint32_t i2c_manual_cmd;
+ uint32_t i2c_trans_status;
+ uint32_t i2c_timing_hs1;
+ uint32_t i2c_timing_hs2;
+ uint32_t i2c_timing_hs3;
+ uint32_t i2c_timing_fs1;
+ uint32_t i2c_timing_fs2;
+ uint32_t i2c_timing_fs3;
+ uint32_t i2c_timing_sla;
+ uint32_t i2c_addr;
+};
+check_member(hsi2c_regs, i2c_addr, 0x70);
-/* The timeouts we live by */
-enum {
- I2C_XFER_TIMEOUT_MS = 35, /* xfer to complete */
- I2C_INIT_TIMEOUT_MS = 1000, /* bus free on init */
- I2C_IDLE_TIMEOUT_MS = 100, /* waiting for bus idle */
- I2C_STOP_TIMEOUT_US = 200, /* waiting for stop events */
+struct i2c_bus
+{
+ int bus_num;
+ struct i2c_regs *regs;
+ enum periph_id periph_id;
+ struct hsi2c_regs *hsregs;
+ int is_highspeed; /* High speed type, rather than I2C */
+ int id;
+ unsigned clk_cycle;
+ unsigned clk_div;
};
-static struct s3c24x0_i2c_bus i2c_buses[] = {
+
+static struct i2c_bus i2c_busses[] = {
{
.bus_num = 0,
- .regs = (struct s3c24x0_i2c *)0x12c60000,
+ .regs = (void *)0x12c60000,
.periph_id = PERIPH_ID_I2C0,
},
{
.bus_num = 1,
- .regs = (struct s3c24x0_i2c *)0x12c70000,
+ .regs = (void *)0x12c70000,
.periph_id = PERIPH_ID_I2C1,
},
{
.bus_num = 2,
- .regs = (struct s3c24x0_i2c *)0x12c80000,
+ .regs = (void *)0x12c80000,
.periph_id = PERIPH_ID_I2C2,
},
{
.bus_num = 3,
- .regs = (struct s3c24x0_i2c *)0x12c90000,
+ .regs = (void *)0x12c90000,
.periph_id = PERIPH_ID_I2C3,
},
/* I2C4-I2C10 are part of the USI block */
{
.bus_num = 4,
- .hsregs = (struct exynos5_hsi2c *)0x12ca0000,
+ .hsregs = (void *)0x12ca0000,
.periph_id = PERIPH_ID_I2C4,
.is_highspeed = 1,
},
{
.bus_num = 5,
- .hsregs = (struct exynos5_hsi2c *)0x12cb0000,
+ .hsregs = (void *)0x12cb0000,
.periph_id = PERIPH_ID_I2C5,
.is_highspeed = 1,
},
{
.bus_num = 6,
- .hsregs = (struct exynos5_hsi2c *)0x12cc0000,
+ .hsregs = (void *)0x12cc0000,
.periph_id = PERIPH_ID_I2C6,
.is_highspeed = 1,
},
{
.bus_num = 7,
- .hsregs = (struct exynos5_hsi2c *)0x12cd0000,
+ .hsregs = (void *)0x12cd0000,
.periph_id = PERIPH_ID_I2C7,
.is_highspeed = 1,
},
{
.bus_num = 8,
- .hsregs = (struct exynos5_hsi2c *)0x12e00000,
+ .hsregs = (void *)0x12e00000,
.periph_id = PERIPH_ID_I2C8,
.is_highspeed = 1,
},
{
.bus_num = 9,
- .hsregs = (struct exynos5_hsi2c *)0x12e10000,
+ .hsregs = (void *)0x12e10000,
.periph_id = PERIPH_ID_I2C9,
.is_highspeed = 1,
},
{
.bus_num = 10,
- .hsregs = (struct exynos5_hsi2c *)0x12e20000,
+ .hsregs = (void *)0x12e20000,
.periph_id = PERIPH_ID_I2C10,
.is_highspeed = 1,
},
};
-/*
- * Wait til the byte transfer is completed.
- *
- * @param i2c- pointer to the appropriate i2c register bank.
- * @return I2C_OK, if transmission was ACKED
- * I2C_NACK, if transmission was NACKED
- * I2C_NOK_TIMEOUT, if transaction did not complete in I2C_TIMEOUT_MS
- */
+// I2C_CTL
+enum {
+ Hsi2cFuncModeI2c = 1 << 0,
+ Hsi2cMaster = 1 << 3,
+ Hsi2cRxchon = 1 << 6,
+ Hsi2cTxchon = 1 << 7,
+ Hsi2cSwRst = 1 << 31
+};
-static int WaitForXfer(struct s3c24x0_i2c *i2c)
-{
- struct mono_time current, end;
+// I2C_FIFO_STAT
+enum {
+ Hsi2cTxFifoLevel = 0x7f << 0,
+ Hsi2cTxFifoFull = 1 << 7,
+ Hsi2cTxFifoEmpty = 1 << 8,
+ Hsi2cRxFifoLevel = 0x7f << 16,
+ Hsi2cRxFifoFull = 1 << 23,
+ Hsi2cRxFifoEmpty = 1 << 24
+};
- timer_monotonic_get(&current);
- end = current;
- mono_time_add_usecs(&end, I2C_TIMEOUT_MS * 1000);
- do {
- if (read32(&i2c->iiccon) & I2CCON_IRPND)
- return (read32(&i2c->iicstat) & I2CSTAT_NACK) ?
- I2C_NACK : I2C_OK;
- timer_monotonic_get(&current);
- } while (mono_time_before(&current, &end));
+// I2C_FIFO_CTL
+enum {
+ Hsi2cRxfifoEn = 1 << 0,
+ Hsi2cTxfifoEn = 1 << 1,
+ Hsi2cTxfifoTriggerLevel = 0x20 << 16,
+ Hsi2cRxfifoTriggerLevel = 0x20 << 4
+};
- printk(BIOS_ERR, "%s timed out\n", __func__);
- return I2C_NOK_TOUT;
-}
+// I2C_TRAILING_CTL
+enum {
+ Hsi2cTrailingCount = 0xff
+};
-static void ReadWriteByte(struct s3c24x0_i2c *i2c)
-{
- write32(read32(&i2c->iiccon) & ~I2CCON_IRPND, &i2c->iiccon);
-}
+// I2C_INT_EN
+enum {
+ Hsi2cIntTxAlmostemptyEn = 1 << 0,
+ Hsi2cIntRxAlmostfullEn = 1 << 1,
+ Hsi2cIntTrailingEn = 1 << 6,
+ Hsi2cIntI2cEn = 1 << 9
+};
-static void i2c_ch_init(struct s3c24x0_i2c_bus *bus, int speed, int slaveadd)
-{
- unsigned long freq, pres = 16, div;
- unsigned long val;
+// I2C_CONF
+enum {
+ Hsi2cAutoMode = 1 << 31,
+ Hsi2c10bitAddrMode = 1 << 30,
+ Hsi2cHsMode = 1 << 29
+};
- freq = clock_get_periph_rate(bus->periph_id);
- /* calculate prescaler and divisor values */
- if ((freq / pres / (16 + 1)) > speed)
- /* set prescaler to 512 */
- pres = 512;
+// I2C_AUTO_CONF
+enum {
+ Hsi2cReadWrite = 1 << 16,
+ Hsi2cStopAfterTrans = 1 << 17,
+ Hsi2cMasterRun = 1 << 31
+};
- div = 0;
- while ((freq / pres / (div + 1)) > speed)
- div++;
+// I2C_TIMEOUT
+enum {
+ Hsi2cTimeoutEn = 1 << 31
+};
+
+// I2C_TRANS_STATUS
+enum {
+ Hsi2cMasterBusy = 1 << 17,
+ Hsi2cSlaveBusy = 1 << 16,
+ Hsi2cTimeoutAuto = 1 << 4,
+ Hsi2cNoDev = 1 << 3,
+ Hsi2cNoDevAck = 1 << 2,
+ Hsi2cTransAbort = 1 << 1,
+ Hsi2cTransDone = 1 << 0
+};
+
+#define HSI2C_SLV_ADDR_MAS(x) ((x & 0x3ff) << 10)
+
+enum {
+ Hsi2cTimeout = 100
+};
+
+enum {
+ I2cConIntPending = 0x1 << 4,
+ I2cConIntEn = 0x1 << 5,
+ I2cConAckGen = 0x1 << 7
+};
+
+enum {
+ I2cStatAck = 0x1 << 0,
+ I2cStatAddrZero = 0x1 << 1,
+ I2cStatAddrSlave = 0x1 << 2,
+ I2cStatArb = 0x1 << 3,
+ I2cStatEnable = 0x1 << 4,
+ I2cStatStartStop = 0x1 << 5,
+ I2cStatBusy = 0x1 << 5,
+
+ I2cStatModeMask = 0x3 << 6,
+ I2cStatSlaveRecv = 0x0 << 6,
+ I2cStatSlaveXmit = 0x1 << 6,
+ I2cStatMasterRecv = 0x2 << 6,
+ I2cStatMasterXmit = 0x3 << 6
+};
- /* set prescaler, divisor according to freq, also set ACKGEN, IRQ */
- val = (div & 0x0F) | 0xA0 | ((pres == 512) ? 0x40 : 0);
- write32(val, &bus->regs->iiccon);
- /* init to SLAVE RECEIVE mode and clear I2CADDn */
- write32(0, &bus->regs->iicstat);
- write32(slaveadd, &bus->regs->iicadd);
- /* program Master Transmit (and implicit STOP) */
- write32(I2C_MODE_MT | I2C_TXRX_ENA, &bus->regs->iicstat);
-}
-static int hsi2c_get_clk_details(struct s3c24x0_i2c_bus *i2c_bus,
- unsigned int bus_freq_hz)
+
+static int hsi2c_get_clk_details(struct i2c_bus *i2c, int *div, int *cycle,
+ unsigned op_clk)
{
- struct exynos5_hsi2c *hsregs = i2c_bus->hsregs;
- unsigned long clkin = clock_get_periph_rate(i2c_bus->periph_id);
- unsigned int i = 0, utemp0 = 0, utemp1 = 0;
- unsigned int t_ftl_cycle;
+ struct hsi2c_regs *regs = i2c->hsregs;
+ unsigned long clkin = clock_get_periph_rate(i2c->periph_id);
- /* FPCLK / FI2C =
+ /*
+ * FPCLK / FI2C =
* (CLK_DIV + 1) * (TSCLK_L + TSCLK_H + 2) + 8 + 2 * FLT_CYCLE
- * uTemp0 = (CLK_DIV + 1) * (TSCLK_L + TSCLK_H + 2)
- * uTemp1 = (TSCLK_L + TSCLK_H + 2)
- * uTemp2 = TSCLK_L + TSCLK_H
+ * temp0 = (CLK_DIV + 1) * (TSCLK_L + TSCLK_H + 2)
+ * temp1 = (TSCLK_L + TSCLK_H + 2)
*/
- t_ftl_cycle = (read32(&hsregs->usi_conf) >> 16) & 0x7;
- utemp0 = (clkin / bus_freq_hz) - 8 - 2 * t_ftl_cycle;
+ uint32_t flt_cycle = (readl(&regs->i2c_conf) >> 16) & 0x7;
+ int temp = (clkin / op_clk) - 8 - 2 * flt_cycle;
- /* CLK_DIV max is 256 */
+ // CLK_DIV max is 256.
+ int i;
for (i = 0; i < 256; i++) {
- utemp1 = utemp0 / (i + 1);
- if ((utemp1 < 512) && (utemp1 > 4)) {
- i2c_bus->clk_cycle = utemp1 - 2;
- i2c_bus->clk_div = i;
+ int period = temp / (i + 1) - 2;
+ if (period < 512 && period >= 2) {
+ *cycle = period;
+ *div = i;
return 0;
}
}
- printk(BIOS_ERR, "%s: failed?\n", __func__);
+ printk(BIOS_ERR, "%s: Failed to find timing parameters.\n", __func__);
return -1;
}
-static void hsi2c_ch_init(struct s3c24x0_i2c_bus *i2c_bus,
- unsigned int bus_freq_hz)
+static void hsi2c_ch_init(struct i2c_bus *i2c, unsigned int frequency)
{
- struct exynos5_hsi2c *hsregs = i2c_bus->hsregs;
- unsigned int t_sr_release;
- unsigned int n_clkdiv;
- unsigned int t_start_su, t_start_hd;
- unsigned int t_stop_su;
- unsigned int t_data_su, t_data_hd;
- unsigned int t_scl_l, t_scl_h;
- u32 i2c_timing_s1;
- u32 i2c_timing_s2;
- u32 i2c_timing_s3;
- u32 i2c_timing_sla;
-
- hsi2c_get_clk_details(i2c_bus, bus_freq_hz);
-
- n_clkdiv = i2c_bus->clk_div;
- t_scl_l = i2c_bus->clk_cycle / 2;
- t_scl_h = i2c_bus->clk_cycle / 2;
- t_start_su = t_scl_l;
- t_start_hd = t_scl_l;
- t_stop_su = t_scl_l;
- t_data_su = t_scl_l / 2;
- t_data_hd = t_scl_l / 2;
- t_sr_release = i2c_bus->clk_cycle;
-
- i2c_timing_s1 = t_start_su << 24 | t_start_hd << 16 | t_stop_su << 8;
- i2c_timing_s2 = t_data_su << 24 | t_scl_l << 8 | t_scl_h << 0;
- i2c_timing_s3 = n_clkdiv << 16 | t_sr_release << 0;
- i2c_timing_sla = t_data_hd << 0;
-
- write32(HSI2C_TRAILING_COUNT, &hsregs->usi_trailing_ctl);
-
- /* Clear to enable Timeout */
- clrsetbits_le32(&hsregs->usi_timeout, HSI2C_TIMEOUT_EN, 0);
-
- write32(read32(&hsregs->usi_conf) | HSI2C_AUTO_MODE, &hsregs->usi_conf);
-
- /* Currently operating in Fast speed mode. */
- write32(i2c_timing_s1, &hsregs->usi_timing_fs1);
- write32(i2c_timing_s2, &hsregs->usi_timing_fs2);
- write32(i2c_timing_s3, &hsregs->usi_timing_fs3);
- write32(i2c_timing_sla, &hsregs->usi_timing_sla);
-
- /* Enable TXFIFO and RXFIFO */
- write32(HSI2C_RXFIFO_EN | HSI2C_TXFIFO_EN, &hsregs->usi_fifo_ctl);
-
- /* i2c_conf configure */
- write32(read32(&hsregs->usi_conf) | HSI2C_AUTO_MODE, &hsregs->usi_conf);
+ struct hsi2c_regs *regs = i2c->hsregs;
+
+ int div, cycle;
+ if (hsi2c_get_clk_details(i2c, &div, &cycle, frequency))
+ return;
+
+ uint32_t sr_release;
+ sr_release = cycle;
+
+ uint32_t scl_l, scl_h, start_su, start_hd, stop_su;
+ scl_l = scl_h = start_su = start_hd = stop_su = cycle / 2;
+
+ uint32_t data_su, data_hd;
+ data_su = data_hd = cycle / 4;
+
+ uint32_t timing_fs1 = start_su << 24 | start_hd << 16 | stop_su << 8;
+ uint32_t timing_fs2 = data_su << 24 | scl_l << 8 | scl_h << 0;
+ uint32_t timing_fs3 = div << 16 | sr_release << 0;
+ uint32_t timing_sla = data_hd << 0;
+
+ // Currently operating in fast speed mode.
+ writel(timing_fs1, &regs->i2c_timing_fs1);
+ writel(timing_fs2, &regs->i2c_timing_fs2);
+ writel(timing_fs3, &regs->i2c_timing_fs3);
+ writel(timing_sla, &regs->i2c_timing_sla);
+
+ // Clear to enable timeout.
+ writel(readl(&regs->i2c_timeout) & ~Hsi2cTimeoutEn,
+ &regs->i2c_timeout);
+
+ writel(Hsi2cTrailingCount, &regs->usi_trailing_ctl);
+ writel(Hsi2cRxfifoEn | Hsi2cTxfifoEn, &regs->usi_fifo_ctl);
+ writel(readl(&regs->i2c_conf) | Hsi2cAutoMode, &regs->i2c_conf);
}
-/* SW reset for the high speed bus */
-static void i2c_reset(struct s3c24x0_i2c_bus *i2c_bus)
+static void hsi2c_reset(struct i2c_bus *i2c)
{
- struct exynos5_hsi2c *i2c = i2c_bus->hsregs;
- u32 i2c_ctl;
-
- /* Set and clear the bit for reset */
- i2c_ctl = read32(&i2c->usi_ctl);
- i2c_ctl |= HSI2C_SW_RST;
- write32(i2c_ctl, &i2c->usi_ctl);
+ struct hsi2c_regs *regs = i2c->hsregs;
- i2c_ctl = read32(&i2c->usi_ctl);
- i2c_ctl &= ~HSI2C_SW_RST;
- write32(i2c_ctl, &i2c->usi_ctl);
+ // Set and clear the bit for reset.
+ writel(readl(&regs->usi_ctl) | Hsi2cSwRst, &regs->usi_ctl);
+ writel(readl(&regs->usi_ctl) & ~Hsi2cSwRst, &regs->usi_ctl);
- /* Initialize the configure registers */
/* FIXME: This just assumes 100KHz as a default bus freq */
- hsi2c_ch_init(i2c_bus, 100000);
+ hsi2c_ch_init(i2c, 100000);
}
-void i2c_init(unsigned bus_num, int speed, int slaveadd)
+static void i2c_ch_init(struct i2c_bus *i2c, int speed)
{
- struct s3c24x0_i2c_bus *i2c;
+ struct i2c_regs *regs = i2c->regs;
+
+ unsigned long freq, pres = 16, div;
+ unsigned long val;
- i2c = &i2c_buses[bus_num];
+ freq = clock_get_periph_rate(i2c->periph_id);
+ // Calculate prescaler and divisor values.
+ if ((freq / pres / (16 + 1)) > speed)
+ /* set prescaler to 512 */
+ pres = 512;
- i2c_reset(i2c);
+ div = 0;
- if (i2c->is_highspeed)
+ while ((freq / pres / (div + 1)) > speed)
+ div++;
+
+ // Set prescaler, divisor according to freq, also set ACKGEN, IRQ.
+ val = (div & 0x0f) | 0xa0 | ((pres == 512) ? 0x40 : 0);
+ writel(val, &regs->con);
+
+ // Init to SLAVE RECEIVE mode and clear I2CADDn.
+ writel(0, &regs->stat);
+ writel(0, &regs->add);
+ // program Master Transmit (and implicit STOP).
+ writel(I2cStatMasterXmit | I2cStatEnable, &regs->stat);
+}
+
+void i2c_init(unsigned bus, int speed, int slaveadd)
+{
+ struct i2c_bus *i2c = &i2c_busses[bus];
+
+ if (i2c->is_highspeed) {
+ hsi2c_reset(i2c);
hsi2c_ch_init(i2c, speed);
- else
- i2c_ch_init(i2c, speed, slaveadd);
+ } else {
+ i2c_ch_init(i2c, speed);
+ }
}
/*
@@ -362,26 +384,26 @@ void i2c_init(unsigned bus_num, int speed, int slaveadd)
* 1 - transfer finished successfully
* -1 - transfer failed
*/
-static int hsi2c_check_transfer(struct exynos5_hsi2c *i2c)
+static int hsi2c_check_transfer(struct hsi2c_regs *regs)
{
- uint32_t status = read32(&i2c->usi_trans_status);
- if (status & (HSI2C_TRANS_ABORT | HSI2C_NO_DEV_ACK |
- HSI2C_NO_DEV | HSI2C_TIMEOUT_AUTO)) {
- if (status & HSI2C_TRANS_ABORT)
+ uint32_t status = read32(&regs->i2c_trans_status);
+ if (status & (Hsi2cTransAbort | Hsi2cNoDevAck |
+ Hsi2cNoDev | Hsi2cTimeoutAuto)) {
+ if (status & Hsi2cTransAbort)
printk(BIOS_ERR,
"%s: Transaction aborted.\n", __func__);
- if (status & HSI2C_NO_DEV_ACK)
+ if (status & Hsi2cNoDevAck)
printk(BIOS_ERR,
"%s: No ack from device.\n", __func__);
- if (status & HSI2C_NO_DEV)
+ if (status & Hsi2cNoDev)
printk(BIOS_ERR,
"%s: No response from device.\n", __func__);
- if (status & HSI2C_TIMEOUT_AUTO)
+ if (status & Hsi2cTimeoutAuto)
printk(BIOS_ERR,
"%s: Transaction time out.\n", __func__);
return -1;
}
- return !(status & HSI2C_MASTER_BUSY);
+ return !(status & Hsi2cMasterBusy);
}
/*
@@ -391,318 +413,254 @@ static int hsi2c_check_transfer(struct exynos5_hsi2c *i2c)
* 1 - transfer finished successfully
* -1 - transfer failed
*/
-static int hsi2c_wait_for_transfer(struct exynos5_hsi2c *i2c)
+static int hsi2c_wait_for_transfer(struct hsi2c_regs *i2c)
{
struct mono_time current, end;
timer_monotonic_get(&current);
end = current;
- mono_time_add_usecs(&end, HSI2C_TIMEOUT * 1000);
+ mono_time_add_usecs(&end, Hsi2cTimeout * 1000);
while (mono_time_before(&current, &end)) {
int ret = hsi2c_check_transfer(i2c);
if (ret)
return ret;
- udelay(5);
timer_monotonic_get(&current);
}
return 0;
}
-static int hsi2c_senddata(struct exynos5_hsi2c *i2c, const uint8_t *data,
- int len)
+static int hsi2c_senddata(struct hsi2c_regs *regs, const uint8_t *data, int len)
{
- while (!hsi2c_check_transfer(i2c) && len) {
- if (!(read32(&i2c->usi_fifo_stat) & HSI2C_TX_FIFO_FULL)) {
- write32(*data++, &i2c->usi_txdata);
+ while (!hsi2c_check_transfer(regs) && len) {
+ if (!(read32(&regs->usi_fifo_stat) & Hsi2cTxFifoFull)) {
+ write32(*data++, &regs->usi_txdata);
len--;
}
}
return len ? -1 : 0;
}
-static int hsi2c_recvdata(struct exynos5_hsi2c *i2c, uint8_t *data, int len)
+static int hsi2c_recvdata(struct hsi2c_regs *regs, uint8_t *data, int len)
{
- while (!hsi2c_check_transfer(i2c) && len) {
- if (!(read32(&i2c->usi_fifo_stat) & HSI2C_RX_FIFO_EMPTY)) {
- *data++ = read32(&i2c->usi_rxdata);
+ while (!hsi2c_check_transfer(regs) && len) {
+ if (!(read32(&regs->usi_fifo_stat) & Hsi2cRxFifoEmpty)) {
+ *data++ = read32(&regs->usi_rxdata);
len--;
}
}
return len ? -1 : 0;
}
-static int hsi2c_write(struct exynos5_hsi2c *i2c,
- unsigned char chip,
- unsigned char addr[],
- unsigned char alen,
- const uint8_t data[],
- unsigned short len)
+static int hsi2c_segment(struct i2c_seg *seg, struct hsi2c_regs *regs, int stop)
{
- uint32_t i2c_auto_conf;
+ const uint32_t usi_ctl = Hsi2cFuncModeI2c | Hsi2cMaster;
- if (hsi2c_wait_for_transfer(i2c) != 1)
- return -1;
+ write32(HSI2C_SLV_ADDR_MAS(seg->chip), &regs->i2c_addr);
- /* chip address */
- write32(HSI2C_SLV_ADDR_MAS(chip), &i2c->i2c_addr);
+ /*
+ * We really only want to stop after this transaction (I think) if the
+ * "stop" parameter is true. I'm assuming that's supposed to make the
+ * controller issue a repeated start, but the documentation isn't very
+ * clear. We may need to switch to manual mode to really get the
+ * behavior we want.
+ */
+ uint32_t autoconf =
+ seg->len | Hsi2cMasterRun | Hsi2cStopAfterTrans;
- /* usi_ctl enable i2c func, master write configure */
- write32((HSI2C_TXCHON | HSI2C_FUNC_MODE_I2C | HSI2C_MASTER),
- &i2c->usi_ctl);
+ if (seg->read) {
+ write32(usi_ctl | Hsi2cRxchon, &regs->usi_ctl);
+ write32(autoconf | Hsi2cReadWrite, &regs->i2c_auto_conf);
- /* auto_conf for write length and stop configure */
- i2c_auto_conf = ((len + alen) | HSI2C_STOP_AFTER_TRANS);
- i2c_auto_conf &= ~HSI2C_READ_WRITE;
- /* Master run, start xfer */
- i2c_auto_conf |= HSI2C_MASTER_RUN;
- write32(i2c_auto_conf, &i2c->usi_auto_conf);
+ if (hsi2c_recvdata(regs, seg->buf, seg->len))
+ return -1;
+ } else {
+ write32(usi_ctl | Hsi2cTxchon, &regs->usi_ctl);
+ write32(autoconf, &regs->i2c_auto_conf);
- if (hsi2c_senddata(i2c, addr, alen) ||
- hsi2c_senddata(i2c, data, len) ||
- hsi2c_wait_for_transfer(i2c) != 1) {
- return -1;
+ if (hsi2c_senddata(regs, seg->buf, seg->len))
+ return -1;
}
- write32(HSI2C_FUNC_MODE_I2C, &i2c->usi_ctl);
+ if (hsi2c_wait_for_transfer(regs) != 1)
+ return -1;
+
+ writel(Hsi2cFuncModeI2c, &regs->usi_ctl);
return 0;
}
-static int hsi2c_read(struct exynos5_hsi2c *i2c,
- unsigned char chip,
- unsigned char addr[],
- unsigned char alen,
- uint8_t data[],
- unsigned short len,
- int check)
+static int hsi2c_transfer(struct i2c_bus *i2c, struct i2c_seg *segments,
+ int count)
{
- uint32_t i2c_auto_conf;
-
- /* start read */
- if (hsi2c_wait_for_transfer(i2c) != 1)
+ struct hsi2c_regs *regs = i2c->hsregs;
+ if (hsi2c_wait_for_transfer(regs) != 1) {
+ hsi2c_reset(i2c);
return -1;
+ }
- /* chip address */
- write32(HSI2C_SLV_ADDR_MAS(chip), &i2c->i2c_addr);
-
- if (alen) {
- /* usi_ctl enable i2c func, master write configure */
- write32(HSI2C_TXCHON | HSI2C_FUNC_MODE_I2C | HSI2C_MASTER,
- &i2c->usi_ctl);
-
- /* auto_conf */
- write32(alen | HSI2C_MASTER_RUN | HSI2C_STOP_AFTER_TRANS,
- &i2c->usi_auto_conf);
-
- if (hsi2c_senddata(i2c, addr, alen) ||
- hsi2c_wait_for_transfer(i2c) != 1) {
+ int i;
+ for (i = 0; i < count; i++) {
+ if (hsi2c_segment(&segments[i], regs, i == count - 1)) {
+ hsi2c_reset(i2c);
return -1;
}
}
- /* usi_ctl enable i2c func, master WRITE configure */
- write32((HSI2C_RXCHON | HSI2C_FUNC_MODE_I2C | HSI2C_MASTER),
- &i2c->usi_ctl);
+ return 0;
+}
- /* auto_conf, length and stop configure */
- i2c_auto_conf = (len | HSI2C_STOP_AFTER_TRANS | HSI2C_READ_WRITE);
- i2c_auto_conf |= HSI2C_MASTER_RUN;
- /* Master run, start xfer */
- write32(i2c_auto_conf, &i2c->usi_auto_conf);
- if (hsi2c_recvdata(i2c, data, len) ||
- hsi2c_wait_for_transfer(i2c) != 1) {
- return -1;
- }
- write32(HSI2C_FUNC_MODE_I2C, &i2c->usi_ctl);
- return 0;
+
+static int i2c_int_pending(struct i2c_regs *regs)
+{
+ return readb(&regs->con) & I2cConIntPending;
}
-/*
- * cmd_type is 0 for write, 1 for read.
- *
- * addr_len can take any value from 0-255, it is only limited
- * by the char, we could make it larger if needed. If it is
- * 0 we skip the address write cycle.
- */
-static int i2c_transfer(struct s3c24x0_i2c *i2c,
- unsigned char cmd_type,
- unsigned char chip,
- unsigned char addr[],
- unsigned char addr_len,
- unsigned char data[],
- unsigned short data_len)
+static void i2c_clear_int(struct i2c_regs *regs)
{
- int i = 0, result;
- struct mono_time current, end;
+ writeb(readb(&regs->con) & ~I2cConIntPending, &regs->con);
+}
- if (data == 0 || data_len == 0) {
- printk(BIOS_ERR, "i2c_transfer: bad call\n");
- return I2C_NOK;
- }
+static void i2c_ack_enable(struct i2c_regs *regs)
+{
+ writeb(readb(&regs->con) | I2cConAckGen, &regs->con);
+}
- timer_monotonic_get(&current);
- end = current;
- mono_time_add_usecs(&end, I2C_TIMEOUT_MS * 1000);
- while (read32(&i2c->iicstat) & I2CSTAT_BSY) {
- if (!mono_time_before(&current, &end)){
- printk(BIOS_ERR, "%s timed out\n", __func__);
- return I2C_NOK_TOUT;
- }
- timer_monotonic_get(&current);
+static void i2c_ack_disable(struct i2c_regs *regs)
+{
+ writeb(readb(&regs->con) & ~I2cConAckGen, &regs->con);
+}
+
+static int i2c_got_ack(struct i2c_regs *regs)
+{
+ return !(readb(&regs->stat) & I2cStatAck);
+}
+
+static int i2c_wait_for_idle(struct i2c_regs *regs)
+{
+ int timeout = 1000 * 100; // 1s.
+ while (timeout--) {
+ if (!(readb(&regs->stat) & I2cStatBusy))
+ return 0;
+ udelay(10);
}
+ printk(BIOS_ERR, "I2C timeout waiting for idle.\n");
+ return 1;
+}
- write32(read32(&i2c->iiccon) | I2CCON_ACKGEN, &i2c->iiccon);
-
- /* Get the slave chip address going */
- write32(chip, &i2c->iicds);
- if ((cmd_type == I2C_WRITE) || (addr && addr_len))
- write32(I2C_MODE_MT | I2C_TXRX_ENA | I2C_START_STOP,
- &i2c->iicstat);
- else
- write32(I2C_MODE_MR | I2C_TXRX_ENA | I2C_START_STOP,
- &i2c->iicstat);
-
- /* Wait for chip address to transmit. */
- result = WaitForXfer(i2c);
- if (result != I2C_OK)
- goto bailout;
-
- /* If register address needs to be transmitted - do it now. */
- if (addr && addr_len) {
- while ((i < addr_len) && (result == I2C_OK)) {
- write32(addr[i++], &i2c->iicds);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- }
- i = 0;
- if (result != I2C_OK)
- goto bailout;
+static int i2c_wait_for_int(struct i2c_regs *regs)
+{
+ int timeout = 1000 * 100; // 1s.
+ while (timeout--) {
+ if (i2c_int_pending(regs))
+ return 0;
+ udelay(10);
}
+ printk(BIOS_ERR, "I2C timeout waiting for I2C interrupt.\n");
+ return 1;
+}
- switch (cmd_type) {
- case I2C_WRITE:
- while ((i < data_len) && (result == I2C_OK)) {
- write32(data[i++], &i2c->iicds);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- }
- break;
-
- case I2C_READ:
- if (addr && addr_len) {
- /*
- * Register address has been sent, now send slave chip
- * address again to start the actual read transaction.
- */
- write32(chip, &i2c->iicds);
-
- /* Generate a re-START. */
- write32(I2C_MODE_MR | I2C_TXRX_ENA | I2C_START_STOP,
- &i2c->iicstat);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- if (result != I2C_OK)
- goto bailout;
- }
- while ((i < data_len) && (result == I2C_OK)) {
- /* disable ACK for final READ */
- if (i == data_len - 1)
- write32(read32(&i2c->iiccon)
- & ~I2CCON_ACKGEN,
- &i2c->iiccon);
- ReadWriteByte(i2c);
- result = WaitForXfer(i2c);
- data[i++] = read32(&i2c->iicds);
- }
- if (result == I2C_NACK)
- result = I2C_OK; /* Normal terminated read. */
- break;
-
- default:
- printk(BIOS_ERR, "i2c_transfer: bad call\n");
- result = I2C_NOK;
- break;
- }
-bailout:
- /* Send STOP. */
- write32(I2C_MODE_MR | I2C_TXRX_ENA, &i2c->iicstat);
- ReadWriteByte(i2c);
- return result;
+static int i2c_send_stop(struct i2c_regs *regs)
+{
+ uint8_t mode = readb(&regs->stat) & (I2cStatModeMask);
+ writeb(mode | I2cStatEnable, &regs->stat);
+ i2c_clear_int(regs);
+ return i2c_wait_for_idle(regs);
}
-int i2c_read(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, uint8_t *buf, unsigned len)
+static int i2c_send_start(struct i2c_regs *regs, int read, int chip)
{
- struct s3c24x0_i2c_bus *i2c;
- unsigned char xaddr[4];
- int ret;
+ writeb(chip << 1, &regs->ds);
+ uint8_t mode = read ? I2cStatMasterRecv : I2cStatMasterXmit;
+ writeb(mode | I2cStatStartStop | I2cStatEnable, &regs->stat);
+ i2c_clear_int(regs);
- if (alen > 4) {
- printk(BIOS_ERR, "I2C read: addr len %d not supported\n", alen);
+ if (i2c_wait_for_int(regs))
return 1;
- }
- if (alen > 0) {
- xaddr[0] = (addr >> 24) & 0xFF;
- xaddr[1] = (addr >> 16) & 0xFF;
- xaddr[2] = (addr >> 8) & 0xFF;
- xaddr[3] = addr & 0xFF;
- }
-
- i2c = &i2c_buses[bus];
- if (i2c->is_highspeed)
- ret = hsi2c_read(i2c->hsregs, chip, &xaddr[4 - alen],
- alen, buf, len, 0);
- else
- ret = i2c_transfer(i2c->regs, I2C_READ, chip << 1,
- &xaddr[4 - alen], alen, buf, len);
- if (ret) {
- i2c_reset(i2c);
- printk(BIOS_ERR, "I2C read (bus %02x, chip addr %02x) failed: "
- "%d\n", bus, chip, ret);
+ if (!i2c_got_ack(regs)) {
+ // Nobody home, but they may just be asleep.
return 1;
}
+
return 0;
}
-int i2c_write(unsigned bus, unsigned chip, unsigned addr,
- unsigned alen, const uint8_t *buf, unsigned len)
+static int i2c_xmit_buf(struct i2c_regs *regs, uint8_t *data, int len)
{
- struct s3c24x0_i2c_bus *i2c;
- unsigned char xaddr[4];
- int ret;
+ ASSERT(len);
- if (alen > 4) {
- printk(BIOS_ERR, "I2C write: addr len %d not supported\n",
- alen);
- return 1;
+ i2c_ack_enable(regs);
+
+ int i;
+ for (i = 0; i < len; i++) {
+ writeb(data[i], &regs->ds);
+
+ i2c_clear_int(regs);
+ if (i2c_wait_for_int(regs))
+ return 1;
+
+ if (!i2c_got_ack(regs)) {
+ printk(BIOS_INFO, "I2c nacked.\n");
+ return 1;
+ }
}
- if (alen > 0) {
- xaddr[0] = (addr >> 24) & 0xFF;
- xaddr[1] = (addr >> 16) & 0xFF;
- xaddr[2] = (addr >> 8) & 0xFF;
- xaddr[3] = addr & 0xFF;
+ return 0;
+}
+
+static int i2c_recv_buf(struct i2c_regs *regs, uint8_t *data, int len)
+{
+ ASSERT(len);
+
+ i2c_ack_enable(regs);
+
+ int i;
+ for (i = 0; i < len; i++) {
+ if (i == len - 1)
+ i2c_ack_disable(regs);
+
+ i2c_clear_int(regs);
+ if (i2c_wait_for_int(regs))
+ return 1;
+
+ data[i] = readb(&regs->ds);
}
- i2c = &i2c_buses[bus];
+ return 0;
+}
+
+int i2c_transfer(unsigned bus, struct i2c_seg *segments, int count)
+{
+ struct i2c_bus *i2c = &i2c_busses[bus];
if (i2c->is_highspeed)
- ret = hsi2c_write(i2c->hsregs, chip, &xaddr[4 - alen],
- alen, buf, len);
- else
- ret = i2c_transfer(i2c->regs, I2C_WRITE, chip << 1,
- &xaddr[4 - alen], alen, (void *)buf, len);
+ return hsi2c_transfer(i2c, segments, count);
+ struct i2c_regs *regs = i2c->regs;
+ int res = 0;
- if (ret != 0) {
- i2c_reset(i2c);
- printk(BIOS_ERR, "I2C write (bus %02x, chip addr %02x) failed: "
- "%d\n", bus, chip, ret);
+ if (!regs || i2c_wait_for_idle(regs))
return 1;
+
+ writeb(I2cStatMasterXmit | I2cStatEnable, &regs->stat);
+
+ int i;
+ for (i = 0; i < count; i++) {
+ struct i2c_seg *seg = &segments[i];
+
+ res = i2c_send_start(regs, seg->read, seg->chip);
+ if (res)
+ break;
+ if (seg->read)
+ res = i2c_recv_buf(regs, seg->buf, seg->len);
+ else
+ res = i2c_xmit_buf(regs, seg->buf, seg->len);
+ if (res)
+ break;
}
- return 0;
+
+ return i2c_send_stop(regs) || res;
}
diff --git a/src/soc/samsung/exynos5420/i2c.h b/src/soc/samsung/exynos5420/i2c.h
index 3d0a7a2d18..b9e3c0f5eb 100644
--- a/src/soc/samsung/exynos5420/i2c.h
+++ b/src/soc/samsung/exynos5420/i2c.h
@@ -20,60 +20,6 @@
#ifndef CPU_SAMSUNG_EXYNOS5420_I2C_H
#define CPU_SAMSUNG_EXYNOS5420_I2C_H
-#include "periph.h"
-
-struct s3c24x0_i2c {
- u32 iiccon;
- u32 iicstat;
- u32 iicadd;
- u32 iicds;
- u32 iiclc;
-} __attribute__ ((packed));
-
-struct exynos5_hsi2c {
- u32 usi_ctl;
- u32 usi_fifo_ctl;
- u32 usi_trailing_ctl;
- u32 usi_clk_ctl;
- u32 usi_clk_slot;
- u32 spi_ctl;
- u32 uart_ctl;
- u32 res1;
- u32 usi_int_en;
- u32 usi_int_stat;
- u32 usi_modem_stat;
- u32 usi_error_stat;
- u32 usi_fifo_stat;
- u32 usi_txdata;
- u32 usi_rxdata;
- u32 res2;
- u32 usi_conf;
- u32 usi_auto_conf;
- u32 usi_timeout;
- u32 usi_manual_cmd;
- u32 usi_trans_status;
- u32 usi_timing_hs1;
- u32 usi_timing_hs2;
- u32 usi_timing_hs3;
- u32 usi_timing_fs1;
- u32 usi_timing_fs2;
- u32 usi_timing_fs3;
- u32 usi_timing_sla;
- u32 i2c_addr;
-} __attribute__ ((packed));
-check_member(exynos5_hsi2c, i2c_addr, 0x70);
-
-struct s3c24x0_i2c_bus {
- int bus_num;
- struct s3c24x0_i2c *regs;
- enum periph_id periph_id;
- struct exynos5_hsi2c *hsregs;
- int is_highspeed; /* High speed type, rather than I2C */
- int id;
- unsigned clk_cycle;
- unsigned clk_div;
-};
-
void i2c_init(unsigned bus, int speed, int slaveadd);
#endif /* CPU_SAMSUNG_EXYNOS5420_I2C_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:25:16 +0000