diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:54:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:54:46 +0200 |
| commit | 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6 (patch) | |
| tree | e261299ccded5d87db92850b8dfdadab8ae2c514 /drivers | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| parent | 6b866c151ad9ea44799b32c3a8c90a03c5b981da (diff) | |
Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev
Wolfram Sang <w.sang@pengutronix.de> writes:
This series makes support for a certain type of devices mach independant. We
want that because such devices (having a special register layout) have been
found in mach-mxs and mach-mx6 meanwhile.
Since there is no subsystem maintainer for lib/ and the use case is
currently only for ARM systems, I have agreed to merge these through
the arm-soc tree.
* 'stmp_device' of git://git.pengutronix.de/git/wsa/linux:
i2c: mxs: use global reset function
lib: add support for stmp-style devices
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d2c5095deeac..ccfd37db3dfc 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -483,6 +483,7 @@ config I2C_MV64XXX config I2C_MXS tristate "Freescale i.MX28 I2C interface" depends on SOC_IMX28 + select STMP_DEVICE help Say Y here if you want to use the I2C bus controller on the Freescale i.MX28 processors. 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); |