lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c: iproc: use wrapper for read/write access

Browse Source 
Use the following wrapper for read/write access of iProc i2c registers:
u32 iproc_i2c_rd_reg(struct bcm_iproc_i2c_dev *iproc_i2c,
                     u32 offset)
void iproc_i2c_wr_reg(struct bcm_iproc_i2c_dev *iproc_i2c, u32 offset,
                      u32 val)

This preps the driver for support of indirect register access required
by certain SoCs with this iProc I2C block integrated

Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Signed-off-by: Ray Jui <ray.jui@broadcom.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Rayagonda Kokatanur 2019-04-02 18:18:27 -07:00 committed by Wolfram Sang
parent 3f98ad45e5
commit a9f0a81ef8
1 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
drivers/i2c/busses/i2c-bcm-iproc.c
View File

@ -212,6 +212,18 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave);
static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c, static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c,
bool enable); bool enable);
static inline u32 iproc_i2c_rd_reg(struct bcm_iproc_i2c_dev *iproc_i2c,
u32 offset)
{
return readl(iproc_i2c->base + offset);
}
static inline void iproc_i2c_wr_reg(struct bcm_iproc_i2c_dev *iproc_i2c,
u32 offset, u32 val)
{
writel(val, iproc_i2c->base + offset);
}
static void bcm_iproc_i2c_slave_init( static void bcm_iproc_i2c_slave_init(
struct bcm_iproc_i2c_dev *iproc_i2c, bool need_reset) struct bcm_iproc_i2c_dev *iproc_i2c, bool need_reset)
{ {
@ -219,37 +231,37 @@ static void bcm_iproc_i2c_slave_init(
if (need_reset) { if (need_reset) {
/* put controller in reset */ /* put controller in reset */
val = readl(iproc_i2c->base + CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, CFG_OFFSET);
val |= BIT(CFG_RESET_SHIFT); val |= BIT(CFG_RESET_SHIFT);
writel(val, iproc_i2c->base + CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val);
/* wait 100 usec per spec */ /* wait 100 usec per spec */
udelay(100); udelay(100);
/* bring controller out of reset */ /* bring controller out of reset */
val &= ~(BIT(CFG_RESET_SHIFT)); val &= ~(BIT(CFG_RESET_SHIFT));
writel(val, iproc_i2c->base + CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val);
} }
/* flush TX/RX FIFOs */ /* flush TX/RX FIFOs */
val = (BIT(S_FIFO_RX_FLUSH_SHIFT) | BIT(S_FIFO_TX_FLUSH_SHIFT)); val = (BIT(S_FIFO_RX_FLUSH_SHIFT) | BIT(S_FIFO_TX_FLUSH_SHIFT));
writel(val, iproc_i2c->base + S_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, S_FIFO_CTRL_OFFSET, val);
/* Maximum slave stretch time */ /* Maximum slave stretch time */
val = readl(iproc_i2c->base + TIM_CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET);
val &= ~(TIM_RAND_SLAVE_STRETCH_MASK << TIM_RAND_SLAVE_STRETCH_SHIFT); val &= ~(TIM_RAND_SLAVE_STRETCH_MASK << TIM_RAND_SLAVE_STRETCH_SHIFT);
val |= (SLAVE_CLOCK_STRETCH_TIME << TIM_RAND_SLAVE_STRETCH_SHIFT); val |= (SLAVE_CLOCK_STRETCH_TIME << TIM_RAND_SLAVE_STRETCH_SHIFT);
writel(val, iproc_i2c->base + TIM_CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val);
/* Configure the slave address */ /* Configure the slave address */
val = readl(iproc_i2c->base + S_CFG_SMBUS_ADDR_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, S_CFG_SMBUS_ADDR_OFFSET);
val |= BIT(S_CFG_EN_NIC_SMB_ADDR3_SHIFT); val |= BIT(S_CFG_EN_NIC_SMB_ADDR3_SHIFT);
val &= ~(S_CFG_NIC_SMB_ADDR3_MASK << S_CFG_NIC_SMB_ADDR3_SHIFT); val &= ~(S_CFG_NIC_SMB_ADDR3_MASK << S_CFG_NIC_SMB_ADDR3_SHIFT);
val |= (iproc_i2c->slave->addr << S_CFG_NIC_SMB_ADDR3_SHIFT); val |= (iproc_i2c->slave->addr << S_CFG_NIC_SMB_ADDR3_SHIFT);
writel(val, iproc_i2c->base + S_CFG_SMBUS_ADDR_OFFSET); iproc_i2c_wr_reg(iproc_i2c, S_CFG_SMBUS_ADDR_OFFSET, val);
/* clear all pending slave interrupts */ /* clear all pending slave interrupts */
writel(ISR_MASK_SLAVE, iproc_i2c->base + IS_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IS_OFFSET, ISR_MASK_SLAVE);
/* Enable interrupt register for any READ event */ /* Enable interrupt register for any READ event */
val = BIT(IE_S_RD_EVENT_SHIFT); val = BIT(IE_S_RD_EVENT_SHIFT);
@ -257,7 +269,7 @@ static void bcm_iproc_i2c_slave_init(
val |= BIT(IE_S_RX_EVENT_SHIFT); val |= BIT(IE_S_RX_EVENT_SHIFT);
/* Enable interrupt register for the Slave BUSY command */ /* Enable interrupt register for the Slave BUSY command */
val |= BIT(IE_S_START_BUSY_SHIFT); val |= BIT(IE_S_START_BUSY_SHIFT);
writel(val, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, val);
iproc_i2c->xfer_dir = I2C_SLAVE_DIR_NONE; iproc_i2c->xfer_dir = I2C_SLAVE_DIR_NONE;
} }
@ -267,7 +279,7 @@ static void bcm_iproc_i2c_check_slave_status(
{ {
u32 val; u32 val;
val = readl(iproc_i2c->base + S_CMD_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, S_CMD_OFFSET);
val = (val >> S_CMD_STATUS_SHIFT) & S_CMD_STATUS_MASK; val = (val >> S_CMD_STATUS_SHIFT) & S_CMD_STATUS_MASK;
if (val == S_CMD_STATUS_TIMEOUT) { if (val == S_CMD_STATUS_TIMEOUT) {
@ -290,7 +302,7 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,
/* Start of transaction. check address and populate the direction */ /* Start of transaction. check address and populate the direction */
if (iproc_i2c->xfer_dir == I2C_SLAVE_DIR_NONE) { if (iproc_i2c->xfer_dir == I2C_SLAVE_DIR_NONE) {
tmp = readl(iproc_i2c->base + S_RX_OFFSET); tmp = iproc_i2c_rd_reg(iproc_i2c, S_RX_OFFSET);
rd_status = (tmp >> S_RX_STATUS_SHIFT) & S_RX_STATUS_MASK; rd_status = (tmp >> S_RX_STATUS_SHIFT) & S_RX_STATUS_MASK;
/* This condition checks whether the request is a new request */ /* This condition checks whether the request is a new request */
if (((rd_status == I2C_SLAVE_RX_START) && if (((rd_status == I2C_SLAVE_RX_START) &&
@ -316,16 +328,16 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,
(iproc_i2c->xfer_dir == I2C_SLAVE_DIR_WRITE)) { (iproc_i2c->xfer_dir == I2C_SLAVE_DIR_WRITE)) {
i2c_slave_event(iproc_i2c->slave, i2c_slave_event(iproc_i2c->slave,
I2C_SLAVE_READ_PROCESSED, &value); I2C_SLAVE_READ_PROCESSED, &value);
writel(value, iproc_i2c->base + S_TX_OFFSET); iproc_i2c_wr_reg(iproc_i2c, S_TX_OFFSET, value);
val = BIT(S_CMD_START_BUSY_SHIFT); val = BIT(S_CMD_START_BUSY_SHIFT);
writel(val, iproc_i2c->base + S_CMD_OFFSET); iproc_i2c_wr_reg(iproc_i2c, S_CMD_OFFSET, val);
} }
/* write request from master */ /* write request from master */
if ((status & BIT(IS_S_RX_EVENT_SHIFT)) && if ((status & BIT(IS_S_RX_EVENT_SHIFT)) &&
(iproc_i2c->xfer_dir == I2C_SLAVE_DIR_READ)) { (iproc_i2c->xfer_dir == I2C_SLAVE_DIR_READ)) {
val = readl(iproc_i2c->base + S_RX_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, S_RX_OFFSET);
/* Its a write request by Master to Slave. /* Its a write request by Master to Slave.
* We read data present in receive FIFO * We read data present in receive FIFO
*/ */
@ -348,7 +360,7 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,
} }
/* clear interrupt status */ /* clear interrupt status */
writel(status, iproc_i2c->base + IS_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IS_OFFSET, status);
bcm_iproc_i2c_check_slave_status(iproc_i2c); bcm_iproc_i2c_check_slave_status(iproc_i2c);
return true; return true;
@ -360,12 +372,12 @@ static void bcm_iproc_i2c_read_valid_bytes(struct bcm_iproc_i2c_dev *iproc_i2c)
/* Read valid data from RX FIFO */ /* Read valid data from RX FIFO */
while (iproc_i2c->rx_bytes < msg->len) { while (iproc_i2c->rx_bytes < msg->len) {
if (!((readl(iproc_i2c->base + M_FIFO_CTRL_OFFSET) >> M_FIFO_RX_CNT_SHIFT) if (!((iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET) >> M_FIFO_RX_CNT_SHIFT)
& M_FIFO_RX_CNT_MASK)) & M_FIFO_RX_CNT_MASK))
break; break;
msg->buf[iproc_i2c->rx_bytes] = msg->buf[iproc_i2c->rx_bytes] =
(readl(iproc_i2c->base + M_RX_OFFSET) >> (iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET) >>
M_RX_DATA_SHIFT) & M_RX_DATA_MASK; M_RX_DATA_SHIFT) & M_RX_DATA_MASK;
iproc_i2c->rx_bytes++; iproc_i2c->rx_bytes++;
} }
@ -397,14 +409,15 @@ static void bcm_iproc_i2c_send(struct bcm_iproc_i2c_dev *iproc_i2c)
* Since this is the last byte, we should now * Since this is the last byte, we should now
* disable TX FIFO underrun interrupt * disable TX FIFO underrun interrupt
*/ */
tmp = readl(iproc_i2c->base + IE_OFFSET); tmp = iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
tmp &= ~BIT(IE_M_TX_UNDERRUN_SHIFT); tmp &= ~BIT(IE_M_TX_UNDERRUN_SHIFT);
writel(tmp, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET,
tmp);
} }
} }
/* load data into TX FIFO */ /* load data into TX FIFO */
writel(val, iproc_i2c->base + M_TX_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_TX_OFFSET, val);
} }
/* update number of transferred bytes */ /* update number of transferred bytes */
@ -421,16 +434,16 @@ static void bcm_iproc_i2c_read(struct bcm_iproc_i2c_dev *iproc_i2c)
if (bytes_left == 0) { if (bytes_left == 0) {
if (iproc_i2c->irq) { if (iproc_i2c->irq) {
/* finished reading all data, disable rx thld event */ /* finished reading all data, disable rx thld event */
val = readl(iproc_i2c->base + IE_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
val &= ~BIT(IS_M_RX_THLD_SHIFT); val &= ~BIT(IS_M_RX_THLD_SHIFT);
writel(val, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, val);
} }
} else if (bytes_left < iproc_i2c->thld_bytes) { } else if (bytes_left < iproc_i2c->thld_bytes) {
/* set bytes left as threshold */ /* set bytes left as threshold */
val = readl(iproc_i2c->base + M_FIFO_CTRL_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET);
val &= ~(M_FIFO_RX_THLD_MASK << M_FIFO_RX_THLD_SHIFT); val &= ~(M_FIFO_RX_THLD_MASK << M_FIFO_RX_THLD_SHIFT);
val |= (bytes_left << M_FIFO_RX_THLD_SHIFT); val |= (bytes_left << M_FIFO_RX_THLD_SHIFT);
writel(val, iproc_i2c->base + M_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val);
iproc_i2c->thld_bytes = bytes_left; iproc_i2c->thld_bytes = bytes_left;
} }
/* /*
@ -462,7 +475,7 @@ static void bcm_iproc_i2c_process_m_event(struct bcm_iproc_i2c_dev *iproc_i2c,
static irqreturn_t bcm_iproc_i2c_isr(int irq, void *data) static irqreturn_t bcm_iproc_i2c_isr(int irq, void *data)
{ {
struct bcm_iproc_i2c_dev *iproc_i2c = data; struct bcm_iproc_i2c_dev *iproc_i2c = data;
u32 status = readl(iproc_i2c->base + IS_OFFSET); u32 status = iproc_i2c_rd_reg(iproc_i2c, IS_OFFSET);
bool ret; bool ret;
u32 sl_status = status & ISR_MASK_SLAVE; u32 sl_status = status & ISR_MASK_SLAVE;
@ -480,7 +493,7 @@ static irqreturn_t bcm_iproc_i2c_isr(int irq, void *data)
/* process all master based events */ /* process all master based events */
bcm_iproc_i2c_process_m_event(iproc_i2c, status); bcm_iproc_i2c_process_m_event(iproc_i2c, status);
writel(status, iproc_i2c->base + IS_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IS_OFFSET, status);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -490,29 +503,29 @@ static int bcm_iproc_i2c_init(struct bcm_iproc_i2c_dev *iproc_i2c)
u32 val; u32 val;
/* put controller in reset */ /* put controller in reset */
val = readl(iproc_i2c->base + CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, CFG_OFFSET);
val |= BIT(CFG_RESET_SHIFT); val |= BIT(CFG_RESET_SHIFT);
val &= ~(BIT(CFG_EN_SHIFT)); val &= ~(BIT(CFG_EN_SHIFT));
writel(val, iproc_i2c->base + CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val);
/* wait 100 usec per spec */ /* wait 100 usec per spec */
udelay(100); udelay(100);
/* bring controller out of reset */ /* bring controller out of reset */
val &= ~(BIT(CFG_RESET_SHIFT)); val &= ~(BIT(CFG_RESET_SHIFT));
writel(val, iproc_i2c->base + CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val);
/* flush TX/RX FIFOs and set RX FIFO threshold to zero */ /* flush TX/RX FIFOs and set RX FIFO threshold to zero */
val = (BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT)); val = (BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT));
writel(val, iproc_i2c->base + M_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val);
/* disable all interrupts */ /* disable all interrupts */
val = readl(iproc_i2c->base + IE_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
val &= ~(IE_M_ALL_INTERRUPT_MASK << val &= ~(IE_M_ALL_INTERRUPT_MASK <<
IE_M_ALL_INTERRUPT_SHIFT); IE_M_ALL_INTERRUPT_SHIFT);
writel(val, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, val);
/* clear all pending interrupts */ /* clear all pending interrupts */
writel(0xffffffff, iproc_i2c->base + IS_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IS_OFFSET, 0xffffffff);
return 0; return 0;
} }
@ -522,12 +535,12 @@ static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c,
{ {
u32 val; u32 val;
val = readl(iproc_i2c->base + CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, CFG_OFFSET);
if (enable) if (enable)
val |= BIT(CFG_EN_SHIFT); val |= BIT(CFG_EN_SHIFT);
else else
val &= ~BIT(CFG_EN_SHIFT); val &= ~BIT(CFG_EN_SHIFT);
writel(val, iproc_i2c->base + CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, CFG_OFFSET, val);
} }
static int bcm_iproc_i2c_check_status(struct bcm_iproc_i2c_dev *iproc_i2c, static int bcm_iproc_i2c_check_status(struct bcm_iproc_i2c_dev *iproc_i2c,
@ -535,7 +548,7 @@ static int bcm_iproc_i2c_check_status(struct bcm_iproc_i2c_dev *iproc_i2c,
{ {
u32 val; u32 val;
val = readl(iproc_i2c->base + M_CMD_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, M_CMD_OFFSET);
val = (val >> M_CMD_STATUS_SHIFT) & M_CMD_STATUS_MASK; val = (val >> M_CMD_STATUS_SHIFT) & M_CMD_STATUS_MASK;
switch (val) { switch (val) {
@ -586,15 +599,15 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c,
u32 val, status; u32 val, status;
int ret; int ret;
writel(cmd, iproc_i2c->base + M_CMD_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_CMD_OFFSET, cmd);
if (iproc_i2c->irq) { if (iproc_i2c->irq) {
time_left = wait_for_completion_timeout(&iproc_i2c->done, time_left = wait_for_completion_timeout(&iproc_i2c->done,
time_left); time_left);
/* disable all interrupts */ /* disable all interrupts */
writel(0, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, 0);
/* read it back to flush the write */ /* read it back to flush the write */
readl(iproc_i2c->base + IE_OFFSET); iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
/* make sure the interrupt handler isn't running */ /* make sure the interrupt handler isn't running */
synchronize_irq(iproc_i2c->irq); synchronize_irq(iproc_i2c->irq);
@ -602,9 +615,10 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c,
unsigned long timeout = jiffies + time_left; unsigned long timeout = jiffies + time_left;
do { do {
status = readl(iproc_i2c->base + IS_OFFSET) & ISR_MASK; status = iproc_i2c_rd_reg(iproc_i2c,
IS_OFFSET) & ISR_MASK;
bcm_iproc_i2c_process_m_event(iproc_i2c, status); bcm_iproc_i2c_process_m_event(iproc_i2c, status);
writel(status, iproc_i2c->base + IS_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IS_OFFSET, status);
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
time_left = 0; time_left = 0;
@ -621,7 +635,7 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c,
/* flush both TX/RX FIFOs */ /* flush both TX/RX FIFOs */
val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT); val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT);
writel(val, iproc_i2c->base + M_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -629,7 +643,7 @@ static int bcm_iproc_i2c_xfer_wait(struct bcm_iproc_i2c_dev *iproc_i2c,
if (ret) { if (ret) {
/* flush both TX/RX FIFOs */ /* flush both TX/RX FIFOs */
val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT); val = BIT(M_FIFO_RX_FLUSH_SHIFT) | BIT(M_FIFO_TX_FLUSH_SHIFT);
writel(val, iproc_i2c->base + M_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, val);
return ret; return ret;
} }
@ -645,8 +659,8 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c,
unsigned int tx_bytes; unsigned int tx_bytes;
/* check if bus is busy */ /* check if bus is busy */
if (!!(readl(iproc_i2c->base + M_CMD_OFFSET) & if (!!(iproc_i2c_rd_reg(iproc_i2c,
BIT(M_CMD_START_BUSY_SHIFT))) { M_CMD_OFFSET) & BIT(M_CMD_START_BUSY_SHIFT))) {
dev_warn(iproc_i2c->device, "bus is busy\n"); dev_warn(iproc_i2c->device, "bus is busy\n");
return -EBUSY; return -EBUSY;
} }
@ -655,7 +669,7 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c,
/* format and load slave address into the TX FIFO */ /* format and load slave address into the TX FIFO */
addr = i2c_8bit_addr_from_msg(msg); addr = i2c_8bit_addr_from_msg(msg);
writel(addr, iproc_i2c->base + M_TX_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_TX_OFFSET, addr);
/* /*
* For a write transaction, load data into the TX FIFO. Only allow * For a write transaction, load data into the TX FIFO. Only allow
@ -671,7 +685,7 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c,
if (i == msg->len - 1) if (i == msg->len - 1)
val |= 1 << M_TX_WR_STATUS_SHIFT; val |= 1 << M_TX_WR_STATUS_SHIFT;
writel(val, iproc_i2c->base + M_TX_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_TX_OFFSET, val);
} }
iproc_i2c->tx_bytes = tx_bytes; iproc_i2c->tx_bytes = tx_bytes;
} }
@ -711,10 +725,10 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c,
iproc_i2c->thld_bytes = msg->len; iproc_i2c->thld_bytes = msg->len;
/* set threshold value */ /* set threshold value */
tmp = readl(iproc_i2c->base + M_FIFO_CTRL_OFFSET); tmp = iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET);
tmp &= ~(M_FIFO_RX_THLD_MASK << M_FIFO_RX_THLD_SHIFT); tmp &= ~(M_FIFO_RX_THLD_MASK << M_FIFO_RX_THLD_SHIFT);
tmp |= iproc_i2c->thld_bytes << M_FIFO_RX_THLD_SHIFT; tmp |= iproc_i2c->thld_bytes << M_FIFO_RX_THLD_SHIFT;
writel(tmp, iproc_i2c->base + M_FIFO_CTRL_OFFSET); iproc_i2c_wr_reg(iproc_i2c, M_FIFO_CTRL_OFFSET, tmp);
/* enable the RX threshold interrupt */ /* enable the RX threshold interrupt */
val_intr_en |= BIT(IE_M_RX_THLD_SHIFT); val_intr_en |= BIT(IE_M_RX_THLD_SHIFT);
@ -726,7 +740,7 @@ static int bcm_iproc_i2c_xfer_single_msg(struct bcm_iproc_i2c_dev *iproc_i2c,
} }
if (iproc_i2c->irq) if (iproc_i2c->irq)
writel(val_intr_en, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, val_intr_en);
return bcm_iproc_i2c_xfer_wait(iproc_i2c, msg, val); return bcm_iproc_i2c_xfer_wait(iproc_i2c, msg, val);
} }
@ -790,10 +804,10 @@ static int bcm_iproc_i2c_cfg_speed(struct bcm_iproc_i2c_dev *iproc_i2c)
} }
iproc_i2c->bus_speed = bus_speed; iproc_i2c->bus_speed = bus_speed;
val = readl(iproc_i2c->base + TIM_CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET);
val &= ~(1 << TIM_CFG_MODE_400_SHIFT); val &= ~(1 << TIM_CFG_MODE_400_SHIFT);
val |= (bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT; val |= (bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT;
writel(val, iproc_i2c->base + TIM_CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val);
dev_info(iproc_i2c->device, "bus set to %u Hz\n", bus_speed); dev_info(iproc_i2c->device, "bus set to %u Hz\n", bus_speed);
@ -868,8 +882,8 @@ static int bcm_iproc_i2c_remove(struct platform_device *pdev)
* Make sure there's no pending interrupt when we remove the * Make sure there's no pending interrupt when we remove the
* adapter * adapter
*/ */
writel(0, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, 0);
readl(iproc_i2c->base + IE_OFFSET); iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
synchronize_irq(iproc_i2c->irq); synchronize_irq(iproc_i2c->irq);
} }
@ -890,8 +904,8 @@ static int bcm_iproc_i2c_suspend(struct device *dev)
* Make sure there's no pending interrupt when we go into * Make sure there's no pending interrupt when we go into
* suspend * suspend
*/ */
writel(0, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, 0);
readl(iproc_i2c->base + IE_OFFSET); iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
synchronize_irq(iproc_i2c->irq); synchronize_irq(iproc_i2c->irq);
} }
@ -916,10 +930,10 @@ static int bcm_iproc_i2c_resume(struct device *dev)
return ret; return ret;
/* configure to the desired bus speed */ /* configure to the desired bus speed */
val = readl(iproc_i2c->base + TIM_CFG_OFFSET); val = iproc_i2c_rd_reg(iproc_i2c, TIM_CFG_OFFSET);
val &= ~(1 << TIM_CFG_MODE_400_SHIFT); val &= ~(1 << TIM_CFG_MODE_400_SHIFT);
val |= (iproc_i2c->bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT; val |= (iproc_i2c->bus_speed == 400000) << TIM_CFG_MODE_400_SHIFT;
writel(val, iproc_i2c->base + TIM_CFG_OFFSET); iproc_i2c_wr_reg(iproc_i2c, TIM_CFG_OFFSET, val);
bcm_iproc_i2c_enable_disable(iproc_i2c, true); bcm_iproc_i2c_enable_disable(iproc_i2c, true);
@ -963,15 +977,15 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave)
iproc_i2c->slave = NULL; iproc_i2c->slave = NULL;
/* disable all slave interrupts */ /* disable all slave interrupts */
tmp = readl(iproc_i2c->base + IE_OFFSET); tmp = iproc_i2c_rd_reg(iproc_i2c, IE_OFFSET);
tmp &= ~(IE_S_ALL_INTERRUPT_MASK << tmp &= ~(IE_S_ALL_INTERRUPT_MASK <<
IE_S_ALL_INTERRUPT_SHIFT); IE_S_ALL_INTERRUPT_SHIFT);
writel(tmp, iproc_i2c->base + IE_OFFSET); iproc_i2c_wr_reg(iproc_i2c, IE_OFFSET, tmp);
/* Erase the slave address programmed */ /* Erase the slave address programmed */
tmp = readl(iproc_i2c->base + S_CFG_SMBUS_ADDR_OFFSET); tmp = iproc_i2c_rd_reg(iproc_i2c, S_CFG_SMBUS_ADDR_OFFSET);
tmp &= ~BIT(S_CFG_EN_NIC_SMB_ADDR3_SHIFT); tmp &= ~BIT(S_CFG_EN_NIC_SMB_ADDR3_SHIFT);
writel(tmp, iproc_i2c->base + S_CFG_SMBUS_ADDR_OFFSET); iproc_i2c_wr_reg(iproc_i2c, S_CFG_SMBUS_ADDR_OFFSET, tmp);
return 0; return 0;
} }