Patchwork i2c: mv64xxx: Do not use writel_relaxed()

login
register
mail settings
Submitter Thierry Reding
Date Sept. 18, 2013, 12:51 p.m.
Message ID <1379508700-30400-1-git-send-email-treding@nvidia.com>
Download mbox | patch
Permalink /patch/275704/
State Accepted
Headers show

Comments

Thierry Reding - Sept. 18, 2013, 12:51 p.m.
The driver is used on PowerPC which don't provide writel_relaxed(). This
breaks the c2k and prpmc2800 default configurations. To fix the build,
turn the calls to writel_relaxed() into writel(). The impacts for ARM
should be minimal.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/i2c/busses/i2c-mv64xxx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Wolfram Sang - Sept. 23, 2013, 7:01 a.m.
On Wed, Sep 18, 2013 at 02:51:40PM +0200, Thierry Reding wrote:
> The driver is used on PowerPC which don't provide writel_relaxed(). This
> breaks the c2k and prpmc2800 default configurations. To fix the build,
> turn the calls to writel_relaxed() into writel(). The impacts for ARM
> should be minimal.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Applied to for-current, thanks!

Patch

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 7f3a474..5aead74 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -234,9 +234,9 @@  static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data)
 		ctrl_reg |= MV64XXX_I2C_BRIDGE_CONTROL_WR |
 		    (msg->len - 1) << MV64XXX_I2C_BRIDGE_CONTROL_TX_SIZE_SHIFT;
 
-		writel_relaxed(data_reg_lo,
+		writel(data_reg_lo,
 			drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_LO);
-		writel_relaxed(data_reg_hi,
+		writel(data_reg_hi,
 			drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_HI);
 
 	} else {