summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2005-10-28 12:21:06 +0200
committerStefan Roese <sr@denx.de>2005-10-28 12:21:06 +0200
commite190290ba40fc5340cefd04dd6abf5def15065b9 (patch)
tree34c6a60910c333f7765854847c6cf34b0b73b8d4
parent7b5cac0e1958173a390ae6d620a610028cad25f8 (diff)
Fix external IRQ configuration on Yellowstone & Yosemite
The multiplexed signals Ext IRQ0...3 have to be configured as IRQ, because they default to GPIOx (440EP/GR). Patch by Stefan Roese, 28 Oct 2005
-rw-r--r--CHANGELOG3
-rw-r--r--board/amcc/yellowstone/yellowstone.c5
-rw-r--r--board/amcc/yosemite/yosemite.c5
3 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f02d194ffba..996171122dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Fix external IRQ configuration on Yellowstone & Yosemite
+ Patch by Stefan Roese, 28 Oct 2005
+
* Add PCI support for the TQM834x board.
* Add missing 4xx board to MAKEALL
diff --git a/board/amcc/yellowstone/yellowstone.c b/board/amcc/yellowstone/yellowstone.c
index 4c0ae21ef34..c2b7cf17737 100644
--- a/board/amcc/yellowstone/yellowstone.c
+++ b/board/amcc/yellowstone/yellowstone.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);
+
#if 0 /* test-only */
/*setup USB 2.0 */
out32(GPIO1_TCR, in32(GPIO1_TCR) | 0xc0000000);
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c
index 71907400234..03b412b82f8 100644
--- 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);