Skip to contentSkip to conversation

Cleanup pegasos i8259 not in device tree workaround.

POWERPC Grant Likely 2 participants 2 messages Oct 27, 2006 PowerPC

lore
Share & tools
lore
#0 lore raw

From: Grant Likely <[email protected]>

Only make assumptions about i8259 presence if ppc_md.get_irq is not set. Previous workaround only checked chrp_mpic value.

Nicolas, please verify that this patch fixes your mpc52xx pic problems. Ben, I got tired of how often this question was being raised, so I just wrote this patch; I've compiled, but cannot test it.

---
 arch/powerpc/platforms/chrp/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/platforms/chrp/setup.c +1 -1
index 49b8dab..a5466ed 100644
@@ -451,7 +451,7 @@ static void __init chrp_find_8259(void)
 	 * we have a pegasos that claims to be chrp but doesn't have
 	 * a proper interrupt tree
 	 */
-	if (pic == NULL && chrp_mpic != NULL) {
+	if (pic == NULL && ppc_md.get_irq != NULL) {
 		printk(KERN_ERR "i8259: Not found in device-tree"
 		       " assuming no legacy interrupts\n");
 		return;
Signature · 1 line
1.4.3.rc2.g0503
#1 lore raw
Quoted 10 lines · Grant Likely

From: Grant Likely <[email protected]>

Only make assumptions about i8259 presence if ppc_md.get_irq is not set. Previous workaround only checked chrp_mpic value.

Nicolas, please verify that this patch fixes your mpc52xx pic problems. Ben, I got tired of how often this question was being raised, so I just wrote this patch; I've compiled, but cannot test it.

Quoted 17 lines
---
 arch/powerpc/platforms/chrp/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/platforms/chrp/setup.c +1 -1
index 49b8dab..a5466ed 100644
@@ -451,7 +451,7 @@ static void __init chrp_find_8259(void)
 	 * we have a pegasos that claims to be chrp but doesn't have
 	 * a proper interrupt tree
 	 */
-	if (pic == NULL && chrp_mpic != NULL) {
+	if (pic == NULL && ppc_md.get_irq != NULL) {
 		printk(KERN_ERR "i8259: Not found in device-tree"
 		       " assuming no legacy interrupts\n");
 		return;