diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-18 14:51:40 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-09-27 18:12:30 +0200 |
| commit | 85b3a9356e84f683dd27fe8b73ad15608b4fc2c5 (patch) | |
| tree | f936592099cedebf252e05fd0f692f0be81d7d14 /drivers/i2c | |
| parent | c1a99467804767400752a4087d3e96af2759a046 (diff) | |
| download | kernel_goldelico_gta04-85b3a9356e84f683dd27fe8b73ad15608b4fc2c5.zip kernel_goldelico_gta04-85b3a9356e84f683dd27fe8b73ad15608b4fc2c5.tar.gz kernel_goldelico_gta04-85b3a9356e84f683dd27fe8b73ad15608b4fc2c5.tar.bz2 | |
i2c: mv64xxx: Do not use writel_relaxed()
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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 52c6943..d3e9cc3 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 { |