Fix external IRQ configuration on Yellowstone & Yosemite

[oweals/u-boot.git] / board / amcc / yosemite / yosemite.c

diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index b50e99ab8da481eb80082123acb79d15f1053edf..03b412b82f8e631db68968063df7581a3a065a64 100644 (file)
--- a/board/amcc/yosemite/yosemite.c
+++ b/board/amcc/yosemite/yosemite.c
@@ -95,6 +95,11 @@ int board_early_init_f(void)
        out32(GPIO1_OSRL, in32(GPIO1_OSRL) | 0x00080000);
        out32(GPIO1_ISR2L, in32(GPIO1_ISR2L) | 0x00010000);
 
+       /* external interrupts IRQ0...3 */
+       out32(GPIO1_TCR, in32(GPIO1_TCR) & ~0x0f000000);
+       out32(GPIO1_TSRL, in32(GPIO1_TSRL) & ~0x00005500);
+       out32(GPIO1_ISR1L, in32(GPIO1_ISR1L) | 0x00005500);
+
        /*setup USB 2.0 */
        out32(GPIO1_TCR, in32(GPIO1_TCR) | 0xc0000000);
        out32(GPIO1_OSRL, in32(GPIO1_OSRL) | 0x50000000);
@@ -176,18 +181,24 @@ int misc_init_r (void)
 int checkboard(void)
 {
        sys_info_t sysinfo;
+       unsigned char *s = getenv("serial#");
 
        get_sys_info(&sysinfo);
 
-       printf("Board: AMCC YOSEMITE\n");
+       printf("Board: Yosemite - AMCC PPC440EP Evaluation Board");
+       if (s != NULL) {
+               puts(", serial# ");
+               puts(s);
+       }
+       putc('\n');
+
        printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000);
        printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
        printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
        printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
-       printf("\tPER: %lu MHz\n", sysinfo.freqEPB / 1000000);
+       printf("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000);
        printf("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000);
 
-
        return (0);
 }