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>

diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index faa2e02191ea4f567b077ee8ce46250ed999e424..5a091c40d70b9d638bb67db8ea87ea76b01436c7 100644 (file)
--- 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;

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index a4336a750044fe239d58487cecbb988d8c905e67..2154c7870eb6cef6af5ea0e84d43e5fa4e4ccabd 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -540,6 +540,8 @@
  *      101 -> use PSC6 as UART. Pins PSC6_0 to PSC6_3 are used.
  *             Extended POST test is not available.
  *             Use for STK52xx, FO300 and CAM5200 boards.
+ *             WARNING: When the extended POST is enabled, these bits will
+ *                      be overridden by this code as GPIOs!
  * use PCI_DIS: Bit 16 (mask 0x00008000):
  *        1 -> disable PCI controller (on CAM5200 board).
  * use USB: Bits 18-19 (mask 0x00003000):
@@ -552,7 +554,7 @@
  *      000 -> All PSC2 pins are GPIOs.
  *      100 -> UART (on CAM5200 board).
  *      001 -> CAN1/2 on PSC2 pins.
- *             Use for REV100 STK52xx boards
+ *             Use for REV100 STK52xx boards
  *      01x -> Use AC97 (on FO300 board).
  * use PSC1: Bits 29-31 (mask: 0x00000007):
  *      100 -> UART (on all boards).
@@ -711,20 +713,20 @@
 
 #define CONFIG_SYS_ATA_BASE_ADDR       MPC5XXX_ATA
 
-/* Offset for data I/O                 */
+/* Offset for data I/O */
 #define CONFIG_SYS_ATA_DATA_OFFSET     (0x0060)
 
-/* Offset for normal register accesses */
+/* Offset for normal register accesses */
 #define CONFIG_SYS_ATA_REG_OFFSET      (CONFIG_SYS_ATA_DATA_OFFSET)
 
-/* Offset for alternate registers      */
+/* Offset for alternate registers */
 #define CONFIG_SYS_ATA_ALT_OFFSET      (0x005C)
 
-/* Interval between registers                                               */
+/* Interval between registers */
 #define CONFIG_SYS_ATA_STRIDE          4
 
 /* Support ATAPI devices */
-#define CONFIG_ATAPI            1
+#define CONFIG_ATAPI                   1
 
 /*-----------------------------------------------------------------------
  * Open firmware flat tree support