Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: uniphier: replace debug() with dev_dbg()

Browse source 
Use dev_dbg() functions.  It will be helpful to prefix log messages
with the corresponding device name when the core framework is ready.

While I am here, I renamed "dev", which was actually private data,
into "priv" because dev->dev looks confusing.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-10-13 19:21:57 +09:00
parent 4bb3dac772
commit 804cf1c46f
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/i2c/i2c-uniphier.c
View file

@ -6,14 +6,14 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h> #include <linux/delay.h>
#include <dm.h> #include <linux/errno.h>
#include <linux/types.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/errno.h> #include <linux/types.h>
#include <i2c.h> #include <dm.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <i2c.h>
struct uniphier_i2c_regs { struct uniphier_i2c_regs {
u32 dtrm; /* data transmission */ u32 dtrm; /* data transmission */
@ -38,7 +38,8 @@ struct uniphier_i2c_regs {
#define IOBUS_FREQ 100000000 #define IOBUS_FREQ 100000000
struct uniphier_i2c_dev { struct uniphier_i2c_priv {
struct udevice *dev;
struct uniphier_i2c_regs __iomem *regs; /* register base */ struct uniphier_i2c_regs __iomem *regs; /* register base */
unsigned long input_clk; /* master clock (Hz) */ unsigned long input_clk; /* master clock (Hz) */
unsigned long wait_us; /* wait for every byte transfer (us) */ unsigned long wait_us; /* wait for every byte transfer (us) */
@ -47,7 +48,7 @@ struct uniphier_i2c_dev {
static int uniphier_i2c_probe(struct udevice *dev) static int uniphier_i2c_probe(struct udevice *dev)
{ {
fdt_addr_t addr; fdt_addr_t addr;
struct uniphier_i2c_dev *priv = dev_get_priv(dev); struct uniphier_i2c_priv *priv = dev_get_priv(dev);
addr = devfdt_get_addr(dev); addr = devfdt_get_addr(dev);
if (addr == FDT_ADDR_T_NONE) if (addr == FDT_ADDR_T_NONE)
@ -59,15 +60,17 @@ static int uniphier_i2c_probe(struct udevice *dev)
priv->input_clk = IOBUS_FREQ; priv->input_clk = IOBUS_FREQ;
priv->dev = dev;
/* deassert reset */ /* deassert reset */
writel(0x3, &priv->regs->brst); writel(0x3, &priv->regs->brst);
return 0; return 0;
} }
static int send_and_recv_byte(struct uniphier_i2c_dev *dev, u32 dtrm) static int send_and_recv_byte(struct uniphier_i2c_priv *priv, u32 dtrm)
{ {
writel(dtrm, &dev->regs->dtrm); writel(dtrm, &priv->regs->dtrm);
/* /*
* This controller only provides interruption to inform the completion * This controller only provides interruption to inform the completion
@ -75,72 +78,72 @@ static int send_and_recv_byte(struct uniphier_i2c_dev *dev, u32 dtrm)
* Unfortunately, U-Boot does not have a good support of interrupt. * Unfortunately, U-Boot does not have a good support of interrupt.
* Wait for a while. * Wait for a while.
*/ */
udelay(dev->wait_us); udelay(priv->wait_us);
return readl(&dev->regs->drec); return readl(&priv->regs->drec);
} }
static int send_byte(struct uniphier_i2c_dev *dev, u32 dtrm, bool *stop) static int send_byte(struct uniphier_i2c_priv *priv, u32 dtrm, bool *stop)
{ {
int ret = 0; int ret = 0;
u32 drec; u32 drec;
drec = send_and_recv_byte(dev, dtrm); drec = send_and_recv_byte(priv, dtrm);
if (drec & I2C_DREC_LAB) { if (drec & I2C_DREC_LAB) {
debug("uniphier_i2c: bus arbitration failed\n"); dev_dbg(priv->dev, "uniphier_i2c: bus arbitration failed\n");
*stop = false; *stop = false;
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
if (drec & I2C_DREC_LRB) { if (drec & I2C_DREC_LRB) {
debug("uniphier_i2c: slave did not return ACK\n"); dev_dbg(priv->dev, "uniphier_i2c: slave did not return ACK\n");
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
return ret; return ret;
} }
static int uniphier_i2c_transmit(struct uniphier_i2c_dev *dev, uint addr, static int uniphier_i2c_transmit(struct uniphier_i2c_priv *priv, uint addr,
uint len, const u8 *buf, bool *stop) uint len, const u8 *buf, bool *stop)
{ {
int ret; int ret;
debug("%s: addr = %x, len = %d\n", __func__, addr, len); dev_dbg(priv->dev, "%s: addr = %x, len = %d\n", __func__, addr, len);
ret = send_byte(dev, I2C_DTRM_STA | I2C_DTRM_NACK | addr << 1, stop); ret = send_byte(priv, I2C_DTRM_STA | I2C_DTRM_NACK | addr << 1, stop);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
while (len--) { while (len--) {
ret = send_byte(dev, I2C_DTRM_NACK | *buf++, stop); ret = send_byte(priv, I2C_DTRM_NACK | *buf++, stop);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} }
fail: fail:
if (*stop) if (*stop)
writel(I2C_DTRM_STO | I2C_DTRM_NACK, &dev->regs->dtrm); writel(I2C_DTRM_STO | I2C_DTRM_NACK, &priv->regs->dtrm);
return ret; return ret;
} }
static int uniphier_i2c_receive(struct uniphier_i2c_dev *dev, uint addr, static int uniphier_i2c_receive(struct uniphier_i2c_priv *priv, uint addr,
uint len, u8 *buf, bool *stop) uint len, u8 *buf, bool *stop)
{ {
int ret; int ret;
debug("%s: addr = %x, len = %d\n", __func__, addr, len); dev_dbg(priv->dev, "%s: addr = %x, len = %d\n", __func__, addr, len);
ret = send_byte(dev, I2C_DTRM_STA | I2C_DTRM_NACK | ret = send_byte(priv, I2C_DTRM_STA | I2C_DTRM_NACK |
I2C_DTRM_RD | addr << 1, stop); I2C_DTRM_RD | addr << 1, stop);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
while (len--) while (len--)
*buf++ = send_and_recv_byte(dev, len ? 0 : I2C_DTRM_NACK); *buf++ = send_and_recv_byte(priv, len ? 0 : I2C_DTRM_NACK);
fail: fail:
if (*stop) if (*stop)
writel(I2C_DTRM_STO | I2C_DTRM_NACK, &dev->regs->dtrm); writel(I2C_DTRM_STO | I2C_DTRM_NACK, &priv->regs->dtrm);
return ret; return ret;
} }
@ -149,7 +152,7 @@ static int uniphier_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
int nmsgs) int nmsgs)
{ {
int ret = 0; int ret = 0;
struct uniphier_i2c_dev *dev = dev_get_priv(bus); struct uniphier_i2c_priv *priv = dev_get_priv(bus);
bool stop; bool stop;
for (; nmsgs > 0; nmsgs--, msg++) { for (; nmsgs > 0; nmsgs--, msg++) {
@ -157,10 +160,10 @@ static int uniphier_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
stop = nmsgs > 1 && msg[1].flags & I2C_M_RD ? false : true; stop = nmsgs > 1 && msg[1].flags & I2C_M_RD ? false : true;
if (msg->flags & I2C_M_RD) if (msg->flags & I2C_M_RD)
ret = uniphier_i2c_receive(dev, msg->addr, msg->len, ret = uniphier_i2c_receive(priv, msg->addr, msg->len,
msg->buf, &stop); msg->buf, &stop);
else else
ret = uniphier_i2c_transmit(dev, msg->addr, msg->len, ret = uniphier_i2c_transmit(priv, msg->addr, msg->len,
msg->buf, &stop); msg->buf, &stop);
if (ret < 0) if (ret < 0)
@ -172,7 +175,7 @@ static int uniphier_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
static int uniphier_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) static int uniphier_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
{ {
struct uniphier_i2c_dev *priv = dev_get_priv(bus); struct uniphier_i2c_priv *priv = dev_get_priv(bus);
/* max supported frequency is 400 kHz */ /* max supported frequency is 400 kHz */
if (speed > 400000) if (speed > 400000)
@ -211,6 +214,6 @@ U_BOOT_DRIVER(uniphier_i2c) = {
.id = UCLASS_I2C, .id = UCLASS_I2C,
.of_match = uniphier_i2c_of_match, .of_match = uniphier_i2c_of_match,
.probe = uniphier_i2c_probe, .probe = uniphier_i2c_probe,
.priv_auto_alloc_size = sizeof(struct uniphier_i2c_dev), .priv_auto_alloc_size = sizeof(struct uniphier_i2c_priv),
.ops = &uniphier_i2c_ops, .ops = &uniphier_i2c_ops,
}; };