Correct GPIO setup (UART1/IRQ's) on yosemite & yellowstone

Patch by Stefan Roese, 29 May 2006

diff --git a/CHANGELOG b/CHANGELOG
index 5bf606bbdeb11a26f686ccb4012b0ed891f1fbf4..bcae5031ae666178df756694dc2c288dfaa0b4f2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Correct GPIO setup (UART1/IRQ's) on yosemite & yellowstone
+  Patch by Stefan Roese, 29 May 2006
+
 * Update Intel IXP4xx support
   - Add IXP4xx NPE ethernet MAC support
   - Add support for Intel IXDPG425 board

diff --git a/board/amcc/yellowstone/yellowstone.c b/board/amcc/yellowstone/yellowstone.c
index 20965c8e3ead7e039b17eb289f5e864af425e6ea..86d0db751d80a6426981521ef178f4443b0601f2 100644 (file)
--- a/board/amcc/yellowstone/yellowstone.c
+++ b/board/amcc/yellowstone/yellowstone.c
@@ -79,8 +79,8 @@ int board_early_init_f(void)
        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_TCR, in32(GPIO1_TCR) & ~0x00f00000);
+       out32(GPIO1_TSRL, in32(GPIO1_TSRL) & ~0x0000ff00);
        out32(GPIO1_ISR1L, in32(GPIO1_ISR1L) | 0x00005500);
 
 #if 0 /* test-only */

diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index 392d0dc34e40b07077916d717cb41d22e4232827..674244155ac9c6a17121d804f52425ee7da26e9b 100644 (file)
--- a/board/amcc/yosemite/yosemite.c
+++ b/board/amcc/yosemite/yosemite.c
@@ -79,8 +79,8 @@ int board_early_init_f(void)
        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_TCR, in32(GPIO1_TCR) & ~0x00f00000);
+       out32(GPIO1_TSRL, in32(GPIO1_TSRL) & ~0x0000ff00);
        out32(GPIO1_ISR1L, in32(GPIO1_ISR1L) | 0x00005500);
 
        /*setup USB 2.0 */