summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx28/mx28evk_pins.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-mx28/mx28evk_pins.c')
-rw-r--r--arch/arm/mach-mx28/mx28evk_pins.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-mx28/mx28evk_pins.c b/arch/arm/mach-mx28/mx28evk_pins.c
index 3fbb6c51af3c..5ac477753265 100644
--- a/arch/arm/mach-mx28/mx28evk_pins.c
+++ b/arch/arm/mach-mx28/mx28evk_pins.c
@@ -86,12 +86,14 @@ static struct pin_desc mx28evk_fixed_pins[] = {
.id = PINID_AUART2_TX,
.fun = PIN_GPIO,
.data = 1,
+ .output = 1,
},
{
.name = "usb1",
.id = PINID_AUART2_RX,
.fun = PIN_GPIO,
.data = 1,
+ .output = 1,
},
#if defined(CONFIG_USB_OTG)
@@ -156,6 +158,7 @@ static struct pin_desc mx28evk_fixed_pins[] = {
.drive = 1,
.pull = 0,
.data = 0,
+ .output = 1,
},
#endif
@@ -1044,11 +1047,11 @@ void __init mx28evk_init_pin_group(struct pin_desc *pins, unsigned count)
if (pin->pull)
mxs_set_pullup(pin->id, pin->pullup, pin->name);
if (pin->fun == PIN_GPIO) {
- if (pin->input)
- gpio_direction_input(MXS_PIN_TO_GPIO(pin->id));
- else
+ if (pin->output)
gpio_direction_output(MXS_PIN_TO_GPIO(pin->id),
- pin->data);
+ pin->data);
+ else
+ gpio_direction_input(MXS_PIN_TO_GPIO(pin->id));
}
}
}