]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
twl4030-gpio: Remove default pullup enable/disable of GPIO
authorJagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
Tue, 30 Sep 2008 18:42:46 +0000 (21:42 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Oct 2008 10:37:35 +0000 (13:37 +0300)
One twl4030_request_gpio() should not tamper with the pullup
enabling/disabling of the rest of the GPIOs. So removing the default
pullup values written to REG_GPIOPUPDCTR1.

Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Girish S G <girishsg@ti.com>
Signed-off-by: Jagadeesh Bhaskar Pakaravoor <j-pakaravoor@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/i2c/chips/twl4030-gpio.c

index 4d89abcc5ea572584f10223401e8f42d629754f9..b51bed0c99513db35843d02ea62ba8787aed2373 100644 (file)
@@ -301,7 +301,6 @@ int twl4030_request_gpio(int gpio)
        if (gpio_usage_count & (0x1 << gpio))
                ret = -EBUSY;
        else {
-               u8 clear_pull[6] = { 0, 0, 0, 0, 0, 0 };
                /* First time usage? - switch on GPIO module */
                if (!gpio_usage_count) {
                        ret =
@@ -311,10 +310,6 @@ int twl4030_request_gpio(int gpio)
                }
                if (!ret)
                        gpio_usage_count |= (0x1 << gpio);
-
-               ret =
-               twl4030_i2c_write(TWL4030_MODULE_GPIO, clear_pull,
-                               REG_GPIOPUPDCTR1, 5);
        }
        up(&gpio_sem);
        return ret;