[U-Boot] [PATCH] 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 --- board/tqc/tqm5200/tqm5200.c | 6 ++---- include/configs/TQM5200.h | 2 ++ 2 files changed, 4 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; diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index e626c75..aedc607 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -566,6 +566,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):
Dear Detlev Zundel,
In message 1254926285-26984-1-git-send-email-dzu@denx.de you wrote:
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
board/tqc/tqm5200/tqm5200.c | 6 ++---- include/configs/TQM5200.h | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-)
Applied (after WS cleanup). Thanks.
Best regards,
Wolfgang Denk
Hi Detlev,
Detlev Zundel wrote on Wednesday, October 07, 2009 4:38 PM:
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
board/tqc/tqm5200/tqm5200.c | 6 ++---- include/configs/TQM5200.h | 2 ++ 2 files changed, 4 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 usedin
* 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 e626c75..aedc607 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -566,6 +566,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, thesebits 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):
Thanks!
Acked-by: Martin Krause <martin.krause <at> tqs.de>
Best Regards, Martin
participants (3)
-
Detlev Zundel -
Martin Krause -
Wolfgang Denk