diff options
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 @@ | |||
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/jiffies.h> | 27 | #include <linux/jiffies.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | 29 | #include <linux/stmp_device.h> | |
30 | #include <mach/common.h> | ||
31 | 30 | ||
32 | #define DRIVER_NAME "mxs-i2c" | 31 | #define DRIVER_NAME "mxs-i2c" |
33 | 32 | ||
@@ -111,13 +110,9 @@ struct mxs_i2c_dev { | |||
111 | struct i2c_adapter adapter; | 110 | struct i2c_adapter adapter; |
112 | }; | 111 | }; |
113 | 112 | ||
114 | /* | ||
115 | * TODO: check if calls to here are really needed. If not, we could get rid of | ||
116 | * mxs_reset_block and the mach-dependency. Needs an I2C analyzer, probably. | ||
117 | */ | ||
118 | static void mxs_i2c_reset(struct mxs_i2c_dev *i2c) | 113 | static void mxs_i2c_reset(struct mxs_i2c_dev *i2c) |
119 | { | 114 | { |
120 | mxs_reset_block(i2c->regs); | 115 | stmp_reset_block(i2c->regs); |
121 | writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET); | 116 | writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET); |
122 | writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE, | 117 | writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE, |
123 | i2c->regs + MXS_I2C_QUEUECTRL_SET); | 118 | i2c->regs + MXS_I2C_QUEUECTRL_SET); |