Message ID | 1340338339-11626-10-git-send-email-troy.kisky@boundarydevices.com |
---|---|
State | Accepted |
Commit | 83a1a19038b0bf36c966b7c7b67708e19b45c3b5 |
Delegated to: | Heiko Schocher |
Headers | show |
Dear Troy Kisky, > imx_reset is only referenced once so > move to that location. > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Marek Vasut <marex@denx.de> > --- > drivers/i2c/mxc_i2c.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c > index ac91872..2ef7b92 100644 > --- a/drivers/i2c/mxc_i2c.c > +++ b/drivers/i2c/mxc_i2c.c > @@ -113,17 +113,6 @@ static uint8_t i2c_imx_get_clk(unsigned int rate) > } > > /* > - * Reset I2C Controller > - */ > -void i2c_reset(void) > -{ > - struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE; > - > - writeb(0, &i2c_regs->i2cr); /* Reset module */ > - writeb(0, &i2c_regs->i2sr); > -} > - > -/* > * Init I2C Bus > */ > void i2c_init(int speed, int unused) > @@ -135,7 +124,9 @@ void i2c_init(int speed, int unused) > /* Store divider value */ > writeb(idx, &i2c_regs->ifdr); > > - i2c_reset(); > + /* Reset module */ > + writeb(0, &i2c_regs->i2cr); > + writeb(0, &i2c_regs->i2sr); > } > > /* Best regards, Marek Vasut
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index ac91872..2ef7b92 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -113,17 +113,6 @@ static uint8_t i2c_imx_get_clk(unsigned int rate) } /* - * Reset I2C Controller - */ -void i2c_reset(void) -{ - struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE; - - writeb(0, &i2c_regs->i2cr); /* Reset module */ - writeb(0, &i2c_regs->i2sr); -} - -/* * Init I2C Bus */ void i2c_init(int speed, int unused) @@ -135,7 +124,9 @@ void i2c_init(int speed, int unused) /* Store divider value */ writeb(idx, &i2c_regs->ifdr); - i2c_reset(); + /* Reset module */ + writeb(0, &i2c_regs->i2cr); + writeb(0, &i2c_regs->i2sr); } /*
imx_reset is only referenced once so move to that location. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- drivers/i2c/mxc_i2c.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)