PPC32: Minor updates for a few MPC8xx platforms.

arch/ppc/platforms/ccm.h

 /*
  * Siemens Card Controller Module specific definitions
  * 
- * Copyright (c) 2001 Wolfgang Denk (wd@denx.de)
+ * Copyright (C) 2001-2002 Wolfgang Denk (wd@denx.de)
  */
 
 #ifndef __MACH_CCM_H
@@ -17,9 +17,9 @@
 #define	IMAP_ADDR     CCM_IMMR_BASE	/* physical base address of IMMR area	*/
 #define IMAP_SIZE     CCM_IMAP_SIZE	/* mapped size of IMMR area		*/
 
-#define	FEC_INTERRUPT	15		/* = SIU_LEVEL7				*/
-#define	DEC_INTERRUPT	13		/* = SIU_LEVEL6				*/
-#define	CPM_INTERRUPT	11		/* = SIU_LEVEL5 (was: SIU_LEVEL2)	*/
+#define	FEC_INTERRUPT	13		/* = SIU_LEVEL6				*/
+#define	DEC_INTERRUPT	11		/* = SIU_LEVEL5				*/
+#define	CPM_INTERRUPT	 9		/* = SIU_LEVEL4				*/
 
 /* We don't use the 8259.
 */

arch/ppc/platforms/tqm8xx.h

 /*
  * TQM8xx(L) board specific definitions
  * 
- * Copyright (c) 1999,2000,2001 Wolfgang Denk (wd@denx.de)
+ * Copyright (c) 1999-2002 Wolfgang Denk (wd@denx.de)
  */
 
 #ifdef __KERNEL__
@@ -26,7 +26,27 @@
  */
 #define PCMCIA_MEM_SIZE		( 64 << 20 )
 
-#define	MAX_HWIFS	1	/* overwrite default in include/asm-ppc/ide.h */
+#ifndef CONFIG_KUP4K
+# define	MAX_HWIFS	1	/* overwrite default in include/asm-ppc/ide.h	*/
+
+#else	/* CONFIG_KUP4K */
+
+# define	MAX_HWIFS	2	/* overwrite default in include/asm-ppc/ide.h	*/
+# ifndef __ASSEMBLY__
+# include <asm/8xx_immap.h>
+static __inline__ void ide_led(int on)
+{
+	volatile immap_t	*immap = (immap_t *)IMAP_ADDR;
+
+	if (on) {
+		immap->im_ioport.iop_padat &= ~0x80;
+	} else {
+		immap->im_ioport.iop_padat |= 0x80;
+	}
+}
+# endif	/* __ASSEMBLY__ */
+# define IDE_LED(x) ide_led((x))
+#endif	/* CONFIG_KUP4K */
 
 /*
  * Definitions for IDE0 Interface
@@ -43,8 +63,18 @@
 #define IDE0_CONTROL_REG_OFFSET		0x0106
 #define IDE0_IRQ_REG_OFFSET		0x000A	/* not used */
 
+/* define IO_BASE for PCMCIA */
+#define _IO_BASE 0x80000000
+#define _IO_BASE_SIZE  (64<<10)
+
+#define	FEC_INTERRUPT		 9	/* = SIU_LEVEL4			*/
+#define PHY_INTERRUPT		12	/* = IRQ6			*/
 #define	IDE0_INTERRUPT		13
 
+#ifdef CONFIG_IDE
+#define ide_request_irq(irq,hand,flg,dev,id)    \
+        request_8xxirq((irq),(hand),(flg),(dev),(id))
+#endif
 
 /*-----------------------------------------------------------------------
  * CPM Ethernet through SCCx.