mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-i2c
This commit is contained in:
commit
f2df46e5d9
2 changed files with 50 additions and 32 deletions
|
@ -8,15 +8,18 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <asm/arch/clock.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#include <asm/arch/imx_lpi2c.h>
|
#include <imx_lpi2c.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
#include <dm.h>
|
#include <dm.h>
|
||||||
#include <fdtdec.h>
|
#include <fdtdec.h>
|
||||||
#include <i2c.h>
|
#include <i2c.h>
|
||||||
|
|
||||||
#define LPI2C_FIFO_SIZE 4
|
#define LPI2C_FIFO_SIZE 4
|
||||||
|
#define LPI2C_NACK_TOUT_MS 1
|
||||||
#define LPI2C_TIMEOUT_MS 100
|
#define LPI2C_TIMEOUT_MS 100
|
||||||
|
|
||||||
|
static int bus_i2c_init(struct udevice *bus, int speed);
|
||||||
|
|
||||||
/* Weak linked function for overridden by some SoC power function */
|
/* Weak linked function for overridden by some SoC power function */
|
||||||
int __weak init_i2c_power(unsigned i2c_num)
|
int __weak init_i2c_power(unsigned i2c_num)
|
||||||
{
|
{
|
||||||
|
@ -90,8 +93,9 @@ static int bus_i2c_wait_for_tx_ready(struct imx_lpi2c_reg *regs)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_send(struct imx_lpi2c_reg *regs, u8 *txbuf, int len)
|
static int bus_i2c_send(struct udevice *bus, u8 *txbuf, int len)
|
||||||
{
|
{
|
||||||
|
struct imx_lpi2c_reg *regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
||||||
lpi2c_status_t result = LPI2C_SUCESS;
|
lpi2c_status_t result = LPI2C_SUCESS;
|
||||||
|
|
||||||
/* empty tx */
|
/* empty tx */
|
||||||
|
@ -110,8 +114,9 @@ static int bus_i2c_send(struct imx_lpi2c_reg *regs, u8 *txbuf, int len)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_receive(struct imx_lpi2c_reg *regs, u8 *rxbuf, int len)
|
static int bus_i2c_receive(struct udevice *bus, u8 *rxbuf, int len)
|
||||||
{
|
{
|
||||||
|
struct imx_lpi2c_reg *regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
||||||
lpi2c_status_t result = LPI2C_SUCESS;
|
lpi2c_status_t result = LPI2C_SUCESS;
|
||||||
u32 val;
|
u32 val;
|
||||||
ulong start_time = get_timer(0);
|
ulong start_time = get_timer(0);
|
||||||
|
@ -152,15 +157,24 @@ static int bus_i2c_receive(struct imx_lpi2c_reg *regs, u8 *rxbuf, int len)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_start(struct imx_lpi2c_reg *regs, u8 addr, u8 dir)
|
static int bus_i2c_start(struct udevice *bus, u8 addr, u8 dir)
|
||||||
{
|
{
|
||||||
lpi2c_status_t result;
|
lpi2c_status_t result;
|
||||||
|
struct imx_lpi2c_reg *regs =
|
||||||
|
(struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
||||||
u32 val;
|
u32 val;
|
||||||
|
|
||||||
result = imx_lpci2c_check_busy_bus(regs);
|
result = imx_lpci2c_check_busy_bus(regs);
|
||||||
if (result) {
|
if (result) {
|
||||||
debug("i2c: start check busy bus: 0x%x\n", result);
|
debug("i2c: start check busy bus: 0x%x\n", result);
|
||||||
return result;
|
|
||||||
|
/* Try to init the lpi2c then check the bus busy again */
|
||||||
|
bus_i2c_init(bus, 100000);
|
||||||
|
result = imx_lpci2c_check_busy_bus(regs);
|
||||||
|
if (result) {
|
||||||
|
printf("i2c: Error check busy bus: 0x%x\n", result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* clear all status flags */
|
/* clear all status flags */
|
||||||
writel(0x7f00, ®s->msr);
|
writel(0x7f00, ®s->msr);
|
||||||
|
@ -180,10 +194,13 @@ static int bus_i2c_start(struct imx_lpi2c_reg *regs, u8 addr, u8 dir)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_stop(struct imx_lpi2c_reg *regs)
|
static int bus_i2c_stop(struct udevice *bus)
|
||||||
{
|
{
|
||||||
lpi2c_status_t result;
|
lpi2c_status_t result;
|
||||||
|
struct imx_lpi2c_reg *regs =
|
||||||
|
(struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
||||||
u32 status;
|
u32 status;
|
||||||
|
ulong start_time;
|
||||||
|
|
||||||
result = bus_i2c_wait_for_tx_ready(regs);
|
result = bus_i2c_wait_for_tx_ready(regs);
|
||||||
if (result) {
|
if (result) {
|
||||||
|
@ -194,7 +211,8 @@ static int bus_i2c_stop(struct imx_lpi2c_reg *regs)
|
||||||
/* send stop command */
|
/* send stop command */
|
||||||
writel(LPI2C_MTDR_CMD(0x2), ®s->mtdr);
|
writel(LPI2C_MTDR_CMD(0x2), ®s->mtdr);
|
||||||
|
|
||||||
while (result == LPI2C_SUCESS) {
|
start_time = get_timer(0);
|
||||||
|
while (1) {
|
||||||
status = readl(®s->msr);
|
status = readl(®s->msr);
|
||||||
result = imx_lpci2c_check_clear_error(regs);
|
result = imx_lpci2c_check_clear_error(regs);
|
||||||
/* stop detect flag */
|
/* stop detect flag */
|
||||||
|
@ -204,39 +222,38 @@ static int bus_i2c_stop(struct imx_lpi2c_reg *regs)
|
||||||
writel(status, ®s->msr);
|
writel(status, ®s->msr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (get_timer(start_time) > LPI2C_NACK_TOUT_MS) {
|
||||||
|
debug("stop timeout\n");
|
||||||
|
return -ETIMEDOUT;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_read(struct imx_lpi2c_reg *regs, u32 chip, u8 *buf, int len)
|
static int bus_i2c_read(struct udevice *bus, u32 chip, u8 *buf, int len)
|
||||||
{
|
{
|
||||||
lpi2c_status_t result;
|
lpi2c_status_t result;
|
||||||
|
|
||||||
result = bus_i2c_start(regs, chip, 1);
|
result = bus_i2c_start(bus, chip, 1);
|
||||||
if (result)
|
if (result)
|
||||||
return result;
|
return result;
|
||||||
result = bus_i2c_receive(regs, buf, len);
|
result = bus_i2c_receive(bus, buf, len);
|
||||||
if (result)
|
|
||||||
return result;
|
|
||||||
result = bus_i2c_stop(regs);
|
|
||||||
if (result)
|
if (result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bus_i2c_write(struct imx_lpi2c_reg *regs, u32 chip, u8 *buf, int len)
|
static int bus_i2c_write(struct udevice *bus, u32 chip, u8 *buf, int len)
|
||||||
{
|
{
|
||||||
lpi2c_status_t result;
|
lpi2c_status_t result;
|
||||||
|
|
||||||
result = bus_i2c_start(regs, chip, 0);
|
result = bus_i2c_start(bus, chip, 0);
|
||||||
if (result)
|
if (result)
|
||||||
return result;
|
return result;
|
||||||
result = bus_i2c_send(regs, buf, len);
|
result = bus_i2c_send(bus, buf, len);
|
||||||
if (result)
|
|
||||||
return result;
|
|
||||||
result = bus_i2c_stop(regs);
|
|
||||||
if (result)
|
if (result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
|
@ -351,38 +368,32 @@ static int bus_i2c_init(struct udevice *bus, int speed)
|
||||||
static int imx_lpi2c_probe_chip(struct udevice *bus, u32 chip,
|
static int imx_lpi2c_probe_chip(struct udevice *bus, u32 chip,
|
||||||
u32 chip_flags)
|
u32 chip_flags)
|
||||||
{
|
{
|
||||||
struct imx_lpi2c_reg *regs;
|
|
||||||
lpi2c_status_t result;
|
lpi2c_status_t result;
|
||||||
|
|
||||||
regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
result = bus_i2c_start(bus, chip, 0);
|
||||||
result = bus_i2c_start(regs, chip, 0);
|
|
||||||
if (result) {
|
if (result) {
|
||||||
bus_i2c_stop(regs);
|
bus_i2c_stop(bus);
|
||||||
bus_i2c_init(bus, 100000);
|
bus_i2c_init(bus, 100000);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = bus_i2c_stop(regs);
|
result = bus_i2c_stop(bus);
|
||||||
if (result) {
|
if (result)
|
||||||
bus_i2c_init(bus, 100000);
|
bus_i2c_init(bus, 100000);
|
||||||
return -result;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx_lpi2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
|
static int imx_lpi2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
|
||||||
{
|
{
|
||||||
struct imx_lpi2c_reg *regs;
|
int ret = 0, ret_stop;
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus);
|
|
||||||
for (; nmsgs > 0; nmsgs--, msg++) {
|
for (; nmsgs > 0; nmsgs--, msg++) {
|
||||||
debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len);
|
debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len);
|
||||||
if (msg->flags & I2C_M_RD)
|
if (msg->flags & I2C_M_RD)
|
||||||
ret = bus_i2c_read(regs, msg->addr, msg->buf, msg->len);
|
ret = bus_i2c_read(bus, msg->addr, msg->buf, msg->len);
|
||||||
else {
|
else {
|
||||||
ret = bus_i2c_write(regs, msg->addr, msg->buf,
|
ret = bus_i2c_write(bus, msg->addr, msg->buf,
|
||||||
msg->len);
|
msg->len);
|
||||||
if (ret)
|
if (ret)
|
||||||
break;
|
break;
|
||||||
|
@ -392,6 +403,12 @@ static int imx_lpi2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
|
||||||
if (ret)
|
if (ret)
|
||||||
debug("i2c_write: error sending\n");
|
debug("i2c_write: error sending\n");
|
||||||
|
|
||||||
|
ret_stop = bus_i2c_stop(bus);
|
||||||
|
if (ret_stop)
|
||||||
|
debug("i2c_xfer: stop bus error\n");
|
||||||
|
|
||||||
|
ret |= ret_stop;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -447,6 +464,7 @@ static const struct dm_i2c_ops imx_lpi2c_ops = {
|
||||||
|
|
||||||
static const struct udevice_id imx_lpi2c_ids[] = {
|
static const struct udevice_id imx_lpi2c_ids[] = {
|
||||||
{ .compatible = "fsl,imx7ulp-lpi2c", },
|
{ .compatible = "fsl,imx7ulp-lpi2c", },
|
||||||
|
{ .compatible = "fsl,imx8qm-lpi2c", },
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue