Commit 701eb264 authored by Rob Herring's avatar Rob Herring

i2c: iop3xx: use standard gpiolib functions

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: default avatarRob Herring <rob.herring@calxeda.com>
Cc: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
Cc: linux-i2c@vger.kernel.org
parent 67ac88ff
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h>
#include "i2c-iop3xx.h" #include "i2c-iop3xx.h"
...@@ -78,11 +79,11 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap) ...@@ -78,11 +79,11 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
*/ */
#if defined(CONFIG_ARCH_IOP32X) || defined(CONFIG_ARCH_IOP33X) #if defined(CONFIG_ARCH_IOP32X) || defined(CONFIG_ARCH_IOP33X)
if (iop3xx_adap->id == 0) { if (iop3xx_adap->id == 0) {
gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW); gpio_set_value(7, 0);
gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW); gpio_set_value(6, 0);
} else { } else {
gpio_line_set(IOP3XX_GPIO_LINE(5), GPIO_LOW); gpio_set_value(5, 0);
gpio_line_set(IOP3XX_GPIO_LINE(4), GPIO_LOW); gpio_set_value(4, 0);
} }
#endif #endif
/* NB SR bits not same position as CR IE bits :-( */ /* NB SR bits not same position as CR IE bits :-( */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment