This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-footbridge / mm.c

diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/mm.c
similarity index 56%
rename from arch/arm/mach-footbridge/common.c
rename to arch/arm/mach-footbridge/mm.c
index eb8238c..ce85de6 100644 (file)
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/mm.c
@@ -1,129 +1,27 @@
 /*
- *  linux/arch/arm/mach-footbridge/common.c
+ *  linux/arch/arm/mach-footbridge/mm.c
  *
  *  Copyright (C) 1998-2000 Russell King, Dave Gilbert.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
+ *
+ *  Extra MM routines for the EBSA285 architecture
  */
 #include <linux/config.h>
-#include <linux/module.h>
-#include <linux/types.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/list.h>
 #include <linux/init.h>
  
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/mach-types.h>
-#include <asm/setup.h>
 #include <asm/hardware/dec21285.h>
+#include <asm/mach-types.h>
 
-#include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include "common.h"
-
-extern void __init isa_init_irq(unsigned int irq);
-
-unsigned int mem_fclk_21285 = 50000000;
-
-EXPORT_SYMBOL(mem_fclk_21285);
-
-static int __init parse_tag_memclk(const struct tag *tag)
-{
-       mem_fclk_21285 = tag->u.memclk.fmemclk;
-       return 0;
-}
-
-__tagtable(ATAG_MEMCLK, parse_tag_memclk);
-
-/*
- * Footbridge IRQ translation table
- *  Converts from our IRQ numbers into FootBridge masks
- */
-static const int fb_irq_mask[] = {
-       IRQ_MASK_UART_RX,       /*  0 */
-       IRQ_MASK_UART_TX,       /*  1 */
-       IRQ_MASK_TIMER1,        /*  2 */
-       IRQ_MASK_TIMER2,        /*  3 */
-       IRQ_MASK_TIMER3,        /*  4 */
-       IRQ_MASK_IN0,           /*  5 */
-       IRQ_MASK_IN1,           /*  6 */
-       IRQ_MASK_IN2,           /*  7 */
-       IRQ_MASK_IN3,           /*  8 */
-       IRQ_MASK_DOORBELLHOST,  /*  9 */
-       IRQ_MASK_DMA1,          /* 10 */
-       IRQ_MASK_DMA2,          /* 11 */
-       IRQ_MASK_PCI,           /* 12 */
-       IRQ_MASK_SDRAMPARITY,   /* 13 */
-       IRQ_MASK_I2OINPOST,     /* 14 */
-       IRQ_MASK_PCI_ABORT,     /* 15 */
-       IRQ_MASK_PCI_SERR,      /* 16 */
-       IRQ_MASK_DISCARD_TIMER, /* 17 */
-       IRQ_MASK_PCI_DPERR,     /* 18 */
-       IRQ_MASK_PCI_PERR,      /* 19 */
-};
-
-static void fb_mask_irq(unsigned int irq)
-{
-       *CSR_IRQ_DISABLE = fb_irq_mask[_DC21285_INR(irq)];
-}
-
-static void fb_unmask_irq(unsigned int irq)
-{
-       *CSR_IRQ_ENABLE = fb_irq_mask[_DC21285_INR(irq)];
-}
-
-static struct irqchip fb_chip = {
-       .ack    = fb_mask_irq,
-       .mask   = fb_mask_irq,
-       .unmask = fb_unmask_irq,
-};
-
-static void __init __fb_init_irq(void)
-{
-       unsigned int irq;
-
-       /*
-        * setup DC21285 IRQs
-        */
-       *CSR_IRQ_DISABLE = -1;
-       *CSR_FIQ_DISABLE = -1;
-
-       for (irq = _DC21285_IRQ(0); irq < _DC21285_IRQ(20); irq++) {
-               set_irq_chip(irq, &fb_chip);
-               set_irq_handler(irq, do_level_IRQ);
-               set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-       }
-}
-
-void __init footbridge_init_irq(void)
-{
-       __fb_init_irq();
-
-       if (!footbridge_cfn_mode())
-               return;
-
-       if (machine_is_ebsa285())
-               /* The following is dependent on which slot
-                * you plug the Southbridge card into.  We
-                * currently assume that you plug it into
-                * the right-hand most slot.
-                */
-               isa_init_irq(IRQ_PCI);
-
-       if (machine_is_cats())
-               isa_init_irq(IRQ_IN2);
-
-       if (machine_is_netwinder())
-               isa_init_irq(IRQ_IN3);
-}
-
 /*
  * Common mapping for all systems.  Note that the outbound write flush is
  * commented out since there is a "No Fix" problem with it.  Not mapping