summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2009-10-07 16:38:05 +0200
committerWolfgang Denk <wd@denx.de>2009-10-08 00:31:23 +0200
commit95c44ec485b46ffb43dbdaa299f1491a500fdadf (patch)
tree8a1f5082e04ea422be70b0a39baa9fc4c79fa4fe /board
parentda01f53404f99db185d196867af79371725d4683 (diff)
downloadu-boot-imx-95c44ec485b46ffb43dbdaa299f1491a500fdadf.zip
u-boot-imx-95c44ec485b46ffb43dbdaa299f1491a500fdadf.tar.gz
u-boot-imx-95c44ec485b46ffb43dbdaa299f1491a500fdadf.tar.bz2
tqm5200: Correct comment and code in post_hotkeys_pressed.
This fixes the code and the comment according to the original intent of doing an intensive memory test when PSC6_3 is pulled low on the STK52xx. Notably PORT_CONFIG will be overridden with this correct code now, so beware. The original code only worked by coincidence depending on the PORT_CONFIG setting from the header file. The new code was tested to ensure that the (undocumented) memory test still works on the STK52x. Signed-off-by: Detlev Zundel <dzu@denx.de> CC: Martin Krause <Martin.Krause@tqs.de> Minor white-space cleanup. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board')
-rw-r--r--board/tqc/tqm5200/tqm5200.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index faa2e02..5a091c4 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -358,11 +358,9 @@ int post_hotkeys_pressed(void)
gpio = (struct mpc5xxx_gpio*) MPC5XXX_GPIO;
/*
- * Configure PSC6_1 and PSC6_3 as GPIO. PSC6 then couldn't be used in
- * CODEC or UART mode. Consumer IrDA should still be possible.
+ * Configure PSC6_0 through PSC6_3 as GPIO.
*/
- gpio->port_config &= ~(0x07000000);
- gpio->port_config |= 0x03000000;
+ gpio->port_config &= ~(0x00700000);
/* Enable GPIO for GPIO_IRDA_1 (IR_USB_CLK pin) = PSC6_3 */
gpio->simple_gpioe |= 0x20000000;