diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-08-31 20:37:50 +0200 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-04-20 23:27:18 +0200 |
| commit | 6b866c151ad9ea44799b32c3a8c90a03c5b981da (patch) | |
| tree | e261299ccded5d87db92850b8dfdadab8ae2c514 /drivers/i2c/busses/i2c-mxs.c | |
| parent | lib: add support for stmp-style devices (diff) | |
| download | linux-6b866c151ad9ea44799b32c3a8c90a03c5b981da.tar.xz linux-6b866c151ad9ea44799b32c3a8c90a03c5b981da.zip | |
i2c: mxs: use global reset function
The former mach specific reset_block function has been converted to a global
one. Use the new one to remove mach dependency from the driver.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-mxs.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 3d471d56bf15..083480241945 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -26,8 +26,7 @@ #include <linux/platform_device.h> #include <linux/jiffies.h> #include <linux/io.h> - -#include <mach/common.h> +#include <linux/stmp_device.h> #define DRIVER_NAME "mxs-i2c" @@ -111,13 +110,9 @@ struct mxs_i2c_dev { struct i2c_adapter adapter; }; -/* - * TODO: check if calls to here are really needed. If not, we could get rid of - * mxs_reset_block and the mach-dependency. Needs an I2C analyzer, probably. - */ static void mxs_i2c_reset(struct mxs_i2c_dev *i2c) { - mxs_reset_block(i2c->regs); + stmp_reset_block(i2c->regs); writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET); writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE, i2c->regs + MXS_I2C_QUEUECTRL_SET); |