summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2009-07-02 13:00:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-07-08 12:27:56 +0200
commit50cbe3e0fc8b664b6257e4d13d156bb741b60b08 (patch)
treea0638b1e83b5c3142bc076a6343faec1c8b99aa0 /arch
parentf1ed0ae1c6d7ee227fb055f44f007c28cc2cae8d (diff)
downloadbarebox-50cbe3e0fc8b664b6257e4d13d156bb741b60b08.tar.gz
barebox-50cbe3e0fc8b664b6257e4d13d156bb741b60b08.tar.xz
IMX regression: fix GPIO_DR usage
GPIO_DR ist defined already as GPIO_GPIO in imx-regs.h. There's no need to define archdependent GPIO_DR. This one fixes a regression brought in by d5ec92129e1c67ac86e92c22d54bb090fb00d616 Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
index 8d767208dd..819ed7f187 100644
--- a/arch/arm/mach-imx/gpio.c
+++ b/arch/arm/mach-imx/gpio.c
@@ -96,7 +96,7 @@ void imx_gpio_set_value(unsigned gpio, int value)
int imx_gpio_direction_input(unsigned gpio)
{
- imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_DR);
+ imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_GPIO);
return 0;
}
@@ -104,7 +104,7 @@ int imx_gpio_direction_input(unsigned gpio)
int imx_gpio_direction_output(unsigned gpio, int value)
{
imx_gpio_set_value(gpio, value);
- imx_gpio_mode(gpio | GPIO_OUT | GPIO_GIUS | GPIO_DR);
+ imx_gpio_mode(gpio | GPIO_OUT | GPIO_GIUS | GPIO_GPIO);
return 0;
}