Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b866c15 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

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: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 4ccf4bea

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/i2c/busses/i2c-mxs.c

+2 −7
Original line number Diff line number Diff line
@@ -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);