All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linuxppc-embedded@ozlabs.org
Cc: p_gortmaker@yahoo.com
Subject: [PATCH 1/5] Updates for WRS SBC82xx boards
Date: Thu, 25 May 2006 14:22:04 -0400	[thread overview]
Message-ID: <20060525182204.GC679@windriver.com> (raw)


patch1: sbc82xx-diff0
	- replace NR_SIU_INTS with NR_CPM_INTS

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff -ur orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c
--- orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c	2006-02-07 16:22:28.000000000 -0500
@@ -74,7 +74,7 @@
 {
 	unsigned long flags;
 
-	irq_nr -= NR_SIU_INTS;
+	irq_nr -= NR_CPM_INTS;
 
 	spin_lock_irqsave(&sbc82xx_i8259_lock, flags);
 	sbc82xx_i8259_mask |= 1 << irq_nr;
@@ -88,7 +88,7 @@
 {
 	unsigned long flags;
 
-	irq_nr -= NR_SIU_INTS;
+	irq_nr -= NR_CPM_INTS;
 
 	spin_lock_irqsave(&sbc82xx_i8259_lock, flags);
 	sbc82xx_i8259_mask |= 1 << irq_nr;
@@ -100,7 +100,7 @@
 {
 	unsigned long flags;
 
-	irq_nr -= NR_SIU_INTS;
+	irq_nr -= NR_CPM_INTS;
 
 	spin_lock_irqsave(&sbc82xx_i8259_lock, flags);
 	sbc82xx_i8259_mask &= ~(1 << irq_nr);
@@ -142,7 +142,7 @@
 			return IRQ_HANDLED;
 		}
 	}
-	__do_IRQ(NR_SIU_INTS + irq, regs);
+	__do_IRQ(NR_CPM_INTS + irq, regs);
 	return IRQ_HANDLED;
 }
 
@@ -173,7 +173,7 @@
 	}
 	
 	/* Set up the interrupt handlers for the i8259 IRQs */
-	for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) {
+	for (i = NR_CPM_INTS; i < NR_CPM_INTS + 8; i++) {
                 irq_desc[i].handler = &sbc82xx_i8259_ic;
 		irq_desc[i].status |= IRQ_LEVEL;
 	}
diff -ur orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h
--- orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h	2006-02-07 14:48:03.000000000 -0500
@@ -24,13 +24,14 @@
 
 #define BOOTROM_RESTART_ADDR      ((uint)0x40000104)
 
-#define SBC82xx_PC_IRQA (NR_SIU_INTS+0)
-#define SBC82xx_PC_IRQB (NR_SIU_INTS+1)
-#define SBC82xx_MPC185_IRQ (NR_SIU_INTS+2)
-#define SBC82xx_ATM_IRQ (NR_SIU_INTS+3)
-#define SBC82xx_PIRQA (NR_SIU_INTS+4)
-#define SBC82xx_PIRQB (NR_SIU_INTS+5)
-#define SBC82xx_PIRQC (NR_SIU_INTS+6)
-#define SBC82xx_PIRQD (NR_SIU_INTS+7)
+#define SBC82xx_PC_IRQA		(NR_CPM_INTS+0)
+#define SBC82xx_PC_IRQB		(NR_CPM_INTS+1)
+#define SBC82xx_MPC185_IRQ	(NR_CPM_INTS+2)
+#define SBC82xx_ATM_IRQ		(NR_CPM_INTS+3)
+
+#define SBC82xx_PIRQA		(NR_CPM_INTS+4)
+#define SBC82xx_PIRQB		(NR_CPM_INTS+5)
+#define SBC82xx_PIRQC		(NR_CPM_INTS+6)
+#define SBC82xx_PIRQD		(NR_CPM_INTS+7)
 
 #endif /* __PPC_SBC82xx_H__ */

                 reply	other threads:[~2006-05-25 18:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060525182204.GC679@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=linuxppc-embedded@ozlabs.org \
    --cc=p_gortmaker@yahoo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.