From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Sun, 08 Jul 2012 09:29:28 -0500 Subject: [PATCH 14/15] i2c: iop3xx: use standard gpiolib functions In-Reply-To: <20120708112903.GB18362@pengutronix.de> References: <1341600040-30993-1-git-send-email-robherring2@gmail.com> <1341600040-30993-15-git-send-email-robherring2@gmail.com> <20120708112903.GB18362@pengutronix.de> Message-ID: <4FF99948.9040008@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 07/08/2012 06:29 AM, Wolfram Sang wrote: > On Fri, Jul 06, 2012 at 01:40:39PM -0500, Rob Herring wrote: >> From: Rob Herring >> >> Instead of using the custom iop3xx gpio functions, use the gpiolib >> variants. This should be functionally the same since the gpiolib >> just calls the iop3xx gpio functions. This is needed in preparation >> of removing iop3xx mach/io.h headers. >> >> Signed-off-by: Rob Herring >> Cc: "Jean Delvare (PC drivers, core)" >> Cc: "Ben Dooks (embedded platforms)" >> Cc: "Wolfram Sang (embedded platforms)" >> Cc: linux-i2c at vger.kernel.org > > Is this dependent on another patch from this series? Or can this go > via the I2C tree? I am fine with just acking this one, but the > whitespace removal should better go via I2C I think. They can go in via i2c tree. The rest probably won't make 3.6. Rob > > Thanks, > > Wolfram > >> --- >> drivers/i2c/busses/i2c-iop3xx.c | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c >> index 567d873..2f99613 100644 >> --- a/drivers/i2c/busses/i2c-iop3xx.c >> +++ b/drivers/i2c/busses/i2c-iop3xx.c >> @@ -39,6 +39,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "i2c-iop3xx.h" >> >> @@ -78,11 +79,11 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap) >> */ >> #if defined(CONFIG_ARCH_IOP32X) || defined(CONFIG_ARCH_IOP33X) >> if (iop3xx_adap->id == 0) { >> - gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW); >> - gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW); >> + gpio_set_value(7, 0); >> + gpio_set_value(6, 0); >> } else { >> - gpio_line_set(IOP3XX_GPIO_LINE(5), GPIO_LOW); >> - gpio_line_set(IOP3XX_GPIO_LINE(4), GPIO_LOW); >> + gpio_set_value(5, 0); >> + gpio_set_value(4, 0); >> } >> #endif >> /* NB SR bits not same position as CR IE bits :-( */ >> -- >> 1.7.9.5 >> >