diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2011-10-12 10:31:44 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-10-27 21:56:35 +0200 |
| commit | b5db0a068a25e71b178e4b89635af731cf2f7c24 (patch) | |
| tree | 9d17469de9e3805d4066c0dd2110bb68851a13c1 | |
| parent | 1037d585d3a4e8f1dceb504c0089f7cc16abdb8c (diff) | |
| download | olio-uboot-2014.01-b5db0a068a25e71b178e4b89635af731cf2f7c24.tar.xz olio-uboot-2014.01-b5db0a068a25e71b178e4b89635af731cf2f7c24.zip | |
omap: Don't use gpio_free to change direction to input
gpio_free() should not have the side effect of setting the line to input since this prevents the gpio command from being able to set a line as output.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/gpio.c | 7 | ||||
| -rw-r--r-- | board/logicpd/zoom2/debug_board.c | 1 | ||||
| -rw-r--r-- | board/logicpd/zoom2/zoom2.c | 1 | ||||
| -rw-r--r-- | board/overo/overo.c | 7 | ||||
| -rw-r--r-- | board/ti/beagle/beagle.c | 6 |
5 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/gpio.c b/arch/arm/cpu/armv7/omap-common/gpio.c index e62c6f4eb..75a02da87 100644 --- a/arch/arm/cpu/armv7/omap-common/gpio.c +++ b/arch/arm/cpu/armv7/omap-common/gpio.c @@ -237,11 +237,4 @@ int gpio_request(int gpio, const char *label) */ void gpio_free(unsigned gpio) { - const struct gpio_bank *bank; - - if (check_gpio(gpio) < 0) - return; - bank = get_gpio_bank(gpio); - - _set_gpio_direction(bank, get_gpio_index(gpio), 1); } diff --git a/board/logicpd/zoom2/debug_board.c b/board/logicpd/zoom2/debug_board.c index 33aa6001b..071e7f98e 100644 --- a/board/logicpd/zoom2/debug_board.c +++ b/board/logicpd/zoom2/debug_board.c @@ -40,7 +40,6 @@ static void zoom2_debug_board_detect (void) */ gpio_direction_input(158); val = gpio_get_value(158); - gpio_free(158); } if (!val) diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c index 21964c240..be3083d9c 100644 --- a/board/logicpd/zoom2/zoom2.c +++ b/board/logicpd/zoom2/zoom2.c @@ -95,7 +95,6 @@ void zoom2_identify(void) gpio_direction_input(94); val = gpio_get_value(94); - gpio_free(94); if (val) revision = ZOOM2_REVISION_BETA; diff --git a/board/overo/overo.c b/board/overo/overo.c index 2f9eba638..3c60b06ae 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -118,10 +118,6 @@ int get_board_revision(void) revision = gpio_get_value(115) << 2 | gpio_get_value(113) << 1 | gpio_get_value(112); - - gpio_free(112); - gpio_free(113); - gpio_free(115); } else { printf("Error: unable to acquire board revision GPIOs\n"); revision = -1; @@ -153,8 +149,7 @@ int get_sdio2_config(void) sdio_direct = 0; } - gpio_free(130); - gpio_free(139); + gpio_direction_input(130); } else { printf("Error: unable to acquire sdio2 clk GPIOs\n"); sdio_direct = -1; diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index aa5047c66..9482c5eac 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -127,10 +127,6 @@ int get_board_revision(void) revision = gpio_get_value(173) << 2 | gpio_get_value(172) << 1 | gpio_get_value(171); - - gpio_free(171); - gpio_free(172); - gpio_free(173); } else { printf("Error: unable to acquire board revision GPIOs\n"); revision = -1; @@ -522,8 +518,6 @@ int do_userbutton(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("NOT pressed.\n"); } - gpio_free(gpio); - return !button; } |