more changes on original files master
authorDobrica Pavlinusic <dpavlin@brr.lan>
Sat, 19 May 2007 00:32:31 +0000 (19:32 -0500)
committerDobrica Pavlinusic <dpavlin@brr.lan>
Sat, 19 May 2007 00:32:31 +0000 (19:32 -0500)
arch/ppc/kernel/open_pic.c
arch/ppc/platforms/Makefile
arch/ppc/platforms/sandpoint.c [deleted file]
include/asm-ppc/todc.h

index 2039ae1..562de7a 100644 (file)
@@ -585,17 +585,13 @@ void openpic_request_IPIs(void)
 
        /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
        request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset,
-                   openpic_ipi_action, SA_INTERRUPT,
-                   "IPI0 (call function)", 0);
+                   openpic_ipi_action, 0, "IPI0 (call function)", 0);
        request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+1,
-                   openpic_ipi_action, SA_INTERRUPT,
-                   "IPI1 (reschedule)", 0);
+                   openpic_ipi_action, 0, "IPI1 (reschedule)", 0);
        request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+2,
-                   openpic_ipi_action, SA_INTERRUPT,
-                   "IPI2 (invalidate tlb)", 0);
+                   openpic_ipi_action, 0, "IPI2 (invalidate tlb)", 0);
        request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+3,
-                   openpic_ipi_action, SA_INTERRUPT,
-                   "IPI3 (xmon break)", 0);
+                   openpic_ipi_action, 0, "IPI3 (xmon break)", 0);
 
        for ( i = 0; i < OPENPIC_NUM_IPI ; i++ )
                openpic_enable_ipi(OPENPIC_VEC_IPI+open_pic_irq_offset+i);
index ab84e70..e646fe8 100644 (file)
@@ -57,7 +57,7 @@ obj-$(CONFIG_LOPEC)           += lopec_setup.o lopec_pci.o
 obj-$(CONFIG_PAL4)             += pal4_setup.o pal4_pci.o cpc700_pic.o
 obj-$(CONFIG_PPLUS)            += pplus_pci.o pplus_setup.o
 obj-$(CONFIG_PRPMC750)         += prpmc750.o
-obj-$(CONFIG_SANDPOINT)                += sandpoint.o
+obj-$(CONFIG_SANDPOINT)                += sandpoint_setup.o sandpoint_pci.o
 obj-$(CONFIG_SPRUCE)           += spruce_setup.o spruce_pci.o cpc700_pic.o
 
 ifeq ($(CONFIG_SMP),y)
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
deleted file mode 100644 (file)
index 4cae030..0000000
+++ /dev/null
@@ -1,972 +0,0 @@
-/*
- * arch/ppc/platforms/sandpoint.c
- *
- * Board setup routines for the Motorola SPS Sandpoint Test Platform.
- *
- * Author: Mark A. Greer
- *         mgreer@mvista.com
- *
- * 2000-2003 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-/*
- * This file adds support for the Motorola SPS Sandpoint Test Platform.
- * These boards have a PPMC slot for the processor so any combination
- * of cpu and host bridge can be attached.  This port is for an 8240 PPMC
- * module from Motorola SPS and other closely related cpu/host bridge
- * combinations (e.g., 750/755/7400 with MPC107 host bridge).
- * The sandpoint itself has a Windbond 83c553 (PCI-ISA bridge, 2 DMA ctlrs, 2
- * cascaded 8259 interrupt ctlrs, 8254 Timer/Counter, and an IDE ctlr), a
- * National 87308 (RTC, 2 UARTs, Keyboard & mouse ctlrs, and a floppy ctlr),
- * and 4 PCI slots (only 2 of which are usable; the other 2 are keyed for 3.3V
- * but are really 5V).
- *
- * The firmware on the sandpoint is called DINK (not my acronym :).  This port
- * depends on DINK to do some basic initialization (e.g., initialize the memory
- * ctlr) and to ensure that the processor is using MAP B (CHRP map).
- *
- * The switch settings for the Sandpoint board MUST be as follows:
- *     S3: down
- *     S4: up
- *     S5: up
- *     S6: down
- *
- * 'down' is in the direction from the PCI slots towards the PPMC slot;
- * 'up' is in the direction from the PPMC slot towards the PCI slots.
- * Be careful, the way the sandpoint board is installed in XT chasses will
- * make the directions reversed.
- *
- * Since Motorola listened to our suggestions for improvement, we now have
- * the Sandpoint X3 board.  All of the PCI slots are available, it uses
- * the serial interrupt interface (just a hardware thing we need to
- * configure properly).
- *
- * Use the default X3 switch settings.  The interrupts are then:
- *             EPIC    Source
- *               0     SIOINT          (8259, active low)
- *               1     PCI #1
- *               2     PCI #2
- *               3     PCI #3
- *               4     PCI #4
- *               7     Winbond INTC    (IDE interrupt)
- *               8     Winbond INTD    (IDE interrupt)
- *
- * It is important to note that this code only supports the Sandpoint X3
- * (all flavors) platform, and it does not support the X2 anymore.  Code
- * that at one time worked on the X2 can be found at:
- * ftp://source.mvista.com/pub/linuxppc/obsolete/sandpoint/
- */
-#include <linux/config.h>
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/reboot.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/blk.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/ide.h>
-#include <linux/irq.h>
-#include <linux/seq_file.h>
-#include <linux/serial.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/time.h>
-#include <asm/dma.h>
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/smp.h>
-#include <asm/keyboard.h>
-#include <asm/vga.h>
-#include <asm/open_pic.h>
-#include <asm/i8259.h>
-#include <asm/todc.h>
-#include <asm/bootinfo.h>
-#include <asm/mpc10x.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppcboot.h>
-
-#include "sandpoint_serial.h"
-
-#include "sandpoint.h"
-
-//#define SYS_266 1
-#define SYS_200 1
-//#define SYS_166 1
-
-//REX:
-#if 0
-extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
-extern int pckbd_getkeycode(unsigned int scancode);
-extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
-                          char raw_mode);
-extern char pckbd_unexpected_up(unsigned char keycode);
-extern void pckbd_leds(unsigned char leds);
-extern void pckbd_init_hw(void);
-extern unsigned char pckbd_sysrq_xlate[128];
-#endif 
-
-extern void gen550_progress(char *, unsigned short);
-extern void gen550_init(int, struct serial_struct *);
-
-unsigned char __res[sizeof (bd_t)];
-
-static void sandpoint_halt(void);
-
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/serial_reg.h>
-#include <asm/serial.h>
-
-static struct serial_state rs_table[RS_TABLE_SIZE] = {
-       SERIAL_PORT_DFNS        /* Defined in <asm/serial.h> */
-};
-
-#endif
-
-/*
- * Define all of the IRQ senses and polarities.  Taken from the
- * Sandpoint X3 User's manual.
- */
-static u_char sandpoint_openpic_initsenses[] __initdata = {
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* 17, EPIC IRQ 1 - PCI1 - flash*/
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* 18, EPIC IRQ 2 - LAN*/
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* 19, EPIC IRQ 3 - Not used*/
-       (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* 20, EPIC IRQ 4 - Not used*/
-       1
-};
-
-/*
- * Motorola SPS Sandpoint interrupt routing.
- */
-//REX: by MUSENKI
-static inline int
-sandpoint_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
-{
-       static char pci_irq_table[][4] =
-       /*
-        *      PCI IDSEL/INTPIN->INTLINE 
-        *         A   B   C   D
-        */
-       {
-               {   0,  0,  0,  0 },    /* IDSEL 13 - mini-PCI */
-               {   1,  -1,  2,  0 },    /* IDSEL 14 - NEC USB2.0 */
-               {   3,  0,  0,  0 },    /* IDSEL 15 - ADM983 */
-               {   4,  0,  0,  0 }
-       };
-
-       const long min_idsel = 13, max_idsel = 16, irqs_per_slot = 4;
-       return PCI_IRQ_TABLE_LOOKUP;
-}
-//REX: by MUSENKI
-
-
-#if 0 //REX
-static void __init
-sandpoint_setup_winbond_83553(struct pci_controller *hose)
-{
-       int devfn;
-
-       /*
-        * Route IDE interrupts directly to the 8259's IRQ 14 & 15.
-        * We can't route the IDE interrupt to PCI INTC# or INTD# because those
-        * woule interfere with the PMC's INTC# and INTD# lines.
-        */
-       /*
-        * Winbond Fcn 0
-        */
-       devfn = PCI_DEVFN(11, 0);
-
-       /* IDE Interrupt Routing Control */
-       early_write_config_byte(hose, 0, devfn, 0x43, 0xef);
-
-       /* PCI Interrupt Routing Control */
-       early_write_config_word(hose, 0, devfn, 0x44, 0x0000);
-
-       /* Want ISA memory cycles to be forwarded to PCI bus.
-        * ISA-to-PCI Addr Decoder Control.
-        */
-       early_write_config_byte(hose, 0, devfn, 0x48, 0xf0);
-
-       /* Enable RTC and Keyboard address locations. */
-       early_write_config_byte(hose, 0, devfn, 0x4d, 0x00);
-
-       /* Enable Port 92.  */
-       early_write_config_byte(hose, 0, devfn, 0x4e, 0x06);
-
-       /*
-        * Winbond Fcn 1
-        */
-       devfn = PCI_DEVFN(11, 1);
-
-       /* Put IDE controller into native mode (via PIR). */
-       early_write_config_byte(hose, 0, devfn, 0x09, 0x8f);
-
-       /* Init IRQ routing, enable both ports, disable fast 16, via
-        * IDE Control/Status Register.
-        */
-       early_write_config_dword(hose, 0, devfn, 0x40, 0x00ff0011);
-}
-#endif
-
-#ifndef CONFIG_SANDPOINT_X3
-/* On the sandpoint X2, we must avoid sending configuration cycles to
- * device #12 (IDSEL addr = AD12).
- */
-static int                     
-sandpoint_exclude_device(u_char bus, u_char devfn)
-{
-#if 0
-       if ((bus == 0) && (PCI_SLOT(devfn) == SANDPOINT_HOST_BRIDGE_IDSEL))
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       else
-               return PCIBIOS_SUCCESSFUL;
-#endif
-#ifdef REX_DBG_PCI
-       printk("REX_DBG_PCI: dev-fun is %X:%X.\n",PCI_SLOT(devfn), PCI_FUNC(devfn));
-#endif 
-       if ((bus == 0) && (PCI_SLOT(devfn) == SANDPOINT_HOST_BRIDGE_IDSEL))
-       {
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       }
-       else
-       {
-               return PCIBIOS_SUCCESSFUL;
-       }       
-
-}
-#endif
-
-static void __init
-sandpoint_find_bridges(void)
-{
-       struct pci_controller *hose;
-
-       hose = pcibios_alloc_controller();
-
-       if (!hose)
-               return;
-
-       hose->first_busno = 0;
-       hose->last_busno = 0xff;
-
-//REX
-#if 0
-       if (mpc10x_bridge_init(hose,
-                              MPC10X_MEM_MAP_B,
-                              MPC10X_MEM_MAP_B, MPC10X_MAPB_EUMB_BASE) == 0) {
-#endif
-       if (mpc10x_bridge_init(hose,
-                              MPC10X_MEM_MAP_B,
-                              MPC10X_MEM_MAP_B,
-                              0xfc000000) == 0) {
-
-               /* Do early winbond init, then scan PCI bus */
-               //sandpoint_setup_winbond_83553(hose);
-#ifndef CONFIG_SANDPOINT_X3
-               ppc_md.pci_exclude_device = sandpoint_exclude_device;
-#endif
-               hose->last_busno = pciauto_bus_scan(hose, hose->first_busno);
-
-               ppc_md.pcibios_fixup = NULL;
-               ppc_md.pcibios_fixup_bus = NULL;
-               ppc_md.pci_swizzle = common_swizzle;
-               ppc_md.pci_map_irq = sandpoint_map_irq;
-       } else {
-               if (ppc_md.progress)
-                       ppc_md.progress("Bridge init failed", 0x100);
-               printk("Host bridge init failed\n");
-       }
-
-       return;
-}
-
-#ifdef CONFIG_SERIAL
-static void __init
-sandpoint_early_serial_map(void)
-{
-       struct serial_struct serial_req;
-
-       /* Setup serial port access */
-       memset(&serial_req, 0, sizeof (serial_req));
-       serial_req.baud_base = BASE_BAUD;
-       serial_req.line = 0;
-       serial_req.port = 0;
-       serial_req.irq = 4;
-       serial_req.flags = ASYNC_BOOT_AUTOCONF;
-       serial_req.io_type = SERIAL_IO_MEM;
-       serial_req.iomem_base = (u_char *) SANDPOINT_SERIAL_0;
-       serial_req.iomem_reg_shift = 0;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-       gen550_init(0, &serial_req);
-#endif
-
-       if (early_serial_setup(&serial_req) != 0)
-               printk("Early serial init of port 0 failed\n");
-
-       /* Assume early_serial_setup() doesn't modify serial_req */
-       serial_req.line = 1;
-       serial_req.port = 1;
-       serial_req.irq = 3;     /* XXXX */
-       serial_req.iomem_base = (u_char *) SANDPOINT_SERIAL_1;
-
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
-       gen550_init(1, &serial_req);
-#endif
-
-       if (early_serial_setup(&serial_req) != 0)
-               printk("Early serial init of port 1 failed\n");
-}
-#endif
-
-static void __init
-sandpoint_setup_arch(void)
-{
-       loops_per_jiffy = 100000000 / HZ;
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       if (initrd_start)
-               ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
-       else
-#endif
-#ifdef CONFIG_ROOT_NFS
-               ROOT_DEV = to_kdev_t(0x00FF);   /* /dev/nfs pseudo device */
-#else
-               ROOT_DEV = to_kdev_t(0x0301);   /* /dev/hda1 IDE disk */
-#endif
-
-       /* Lookup PCI host bridges */
-       sandpoint_find_bridges();
-
-#ifdef CONFIG_SERIAL
-       sandpoint_early_serial_map();
-#endif
-
-#ifdef CONFIG_DUMMY_CONSOLE
-       conswitchp = &dummy_con;
-#endif
-
-       printk(KERN_INFO "Motorola SPS Sandpoint Test Platform\n");
-
-       /* DINK32 12.3 and below do not correctly enable any caches.
-        * We will do this now with good known values.  Future versions
-        * of DINK32 are supposed to get this correct.
-        */
-       if (cur_cpu_spec[0]->cpu_features & CPU_FTR_SPEC7450)
-               /* 745x is different.  We only want to pass along enable. */
-               _set_L2CR(L2CR_L2E);
-       else if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR)
-               /* All modules have 1MB of L2.  We also assume that an
-                * L2 divisor of 3 will work.
-                */
-               _set_L2CR(L2CR_L2E | L2CR_L2SIZ_1MB | L2CR_L2CLK_DIV3
-                         | L2CR_L2RAM_PIPE | L2CR_L2OH_1_0 | L2CR_L2DF);
-#if 0
-       /* Untested right now. */
-       if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L3CR) {
-               /* Magic value. */
-               _set_L3CR(0x8f032000);
-       }
-#endif
-}
-#if 0 //REX:
-#define        SANDPOINT_87308_CFG_ADDR                0x15c
-#define        SANDPOINT_87308_CFG_DATA                0x15d
-
-#define        SANDPOINT_87308_CFG_INB(addr, byte) {                           \
-       outb((addr), SANDPOINT_87308_CFG_ADDR);                         \
-       (byte) = inb(SANDPOINT_87308_CFG_DATA);                         \
-}
-
-#define        SANDPOINT_87308_CFG_OUTB(addr, byte) {                          \
-       outb((addr), SANDPOINT_87308_CFG_ADDR);                         \
-       outb((byte), SANDPOINT_87308_CFG_DATA);                         \
-}
-
-#define SANDPOINT_87308_SELECT_DEV(dev_num) {                          \
-       SANDPOINT_87308_CFG_OUTB(0x07, (dev_num));                      \
-}
-
-#define        SANDPOINT_87308_DEV_ENABLE(dev_num) {                           \
-       SANDPOINT_87308_SELECT_DEV(dev_num);                            \
-       SANDPOINT_87308_CFG_OUTB(0x30, 0x01);                           \
-}
-
-/*
- * Initialize the ISA devices on the Nat'l PC87308VUL SuperIO chip.
- */
-static void __init
-sandpoint_setup_natl_87308(void)
-{
-       u_char reg;
-
-       /*
-        * Enable all the devices on the Super I/O chip.
-        */
-       SANDPOINT_87308_SELECT_DEV(0x00);       /* Select kbd logical device */
-       SANDPOINT_87308_CFG_OUTB(0xf0, 0x00);   /* Set KBC clock to 8 Mhz */
-       SANDPOINT_87308_DEV_ENABLE(0x00);       /* Enable keyboard */
-       SANDPOINT_87308_DEV_ENABLE(0x01);       /* Enable mouse */
-       SANDPOINT_87308_DEV_ENABLE(0x02);       /* Enable rtc */
-       SANDPOINT_87308_DEV_ENABLE(0x03);       /* Enable fdc (floppy) */
-       SANDPOINT_87308_DEV_ENABLE(0x04);       /* Enable parallel */
-       SANDPOINT_87308_DEV_ENABLE(0x05);       /* Enable UART 2 */
-       SANDPOINT_87308_CFG_OUTB(0xf0, 0x82);   /* Enable bank select regs */
-       SANDPOINT_87308_DEV_ENABLE(0x06);       /* Enable UART 1 */
-       SANDPOINT_87308_CFG_OUTB(0xf0, 0x82);   /* Enable bank select regs */
-
-       /* Set up floppy in PS/2 mode */
-       outb(0x09, SIO_CONFIG_RA);
-       reg = inb(SIO_CONFIG_RD);
-       reg = (reg & 0x3F) | 0x40;
-       outb(reg, SIO_CONFIG_RD);
-       outb(reg, SIO_CONFIG_RD);       /* Have to write twice to change! */
-
-       return;
-}
-
-/*
- * Fix IDE interrupts.
- */
-static void __init
-sandpoint_fix_winbond_83553(void)
-{
-       /* Make all 8259 interrupt level sensitive */
-       outb(0xf8, 0x4d0);
-       outb(0xde, 0x4d1);
-
-       return;
-}
-#endif //REX:
-
-static void __init
-sandpoint_init2(void)
-{
-       /* Do Sandpoint board specific initialization.  */
-#if 0  
-       sandpoint_fix_winbond_83553();
-       sandpoint_setup_natl_87308();
-
-       request_region(0x00, 0x20, "dma1");
-       request_region(0x20, 0x20, "pic1");
-       request_region(0x40, 0x20, "timer");
-       request_region(0x80, 0x10, "dma page reg");
-       request_region(0xa0, 0x20, "pic2");
-       request_region(0xc0, 0x20, "dma2");
-#endif //REX:
-       return;
-}
-
-/*
- * Interrupt setup and service.  The i8259 is cascaded from EPIC IRQ0,
- * IRQ1-4 map to PCI slots 1-4, IDE is on EPIC 7 and 8.
- */
-static void __init
-sandpoint_init_IRQ(void)
-{
-       int i;
-
-       OpenPIC_InitSenses = sandpoint_openpic_initsenses;
-       OpenPIC_NumInitSenses = sizeof (sandpoint_openpic_initsenses);
-
-       /*
-        * We need to tell openpic_set_sources where things actually are.
-        * mpc10x_common will setup OpenPIC_Addr at ioremap(EUMB phys base +
-        * EPIC offset (0x40000));  The EPIC IRQ Register Address Map -
-        * Interrupt Source Configuration Registers gives these numbers
-        * as offsets starting at 0x50200, we need to adjust occordinly.
-        */
-
-#if 1
-#ifdef CONFIG_SANDPOINT_X3
-//REX
-       /* Map serial interrupt 0 */
-       openpic_set_sources(0, 1, OpenPIC_Addr + 0x10200);
-       /* Map serial interrupts 2-5 */
-       openpic_set_sources(1, 4, OpenPIC_Addr + 0x10240);
-       /* Map serial interrupts 8-9 */
-       openpic_set_sources(5, 2, OpenPIC_Addr + 0x10300);
-       /* Skip reserved space and map i2c and DMA Ch[01] */
-       openpic_set_sources(7, 3, OpenPIC_Addr + 0x11020);
-       /* Skip reserved space and map Message Unit Interrupt (I2O) */
-       openpic_set_sources(10, 1, OpenPIC_Addr + 0x110C0);
-
-       openpic_set_sources(0, 138, NULL);
-#else
-       /* Map EPIC IRQs 0-3 */
-       openpic_set_sources(0, 5, OpenPIC_Addr + 0x10200);
-       /* Skip reserved space and map i2c and DMA Ch[01] */
-       openpic_set_sources(113, 3, OpenPIC_Addr + 0x11020);
-       /* Skip reserved space and map Message Unit Interrupt (I2O) */
-       openpic_set_sources(118, 1, OpenPIC_Addr + 0x110C0);
-       //REX: UART
-       openpic_set_sources(121, 1, OpenPIC_Addr + 0x11120); //ttyS0
-       
-       openpic_set_sources(122, 1, OpenPIC_Addr + 0x11140);    //ttyS1 jackl
-#endif
-#endif 
-#if 1 //REX:
-#if 0//by Musenki, cause it will panic!
-       openpic_set_sources(0, 32, NULL);
-       openpic_set_sources(129, 3, NULL);//I2C
-       openpic_set_sources(134, 1, NULL);//Mesg
-       openpic_set_sources(137, 2, NULL);//DUART
-#endif 
-       //openpic_init(1, 0, 0, -1);
-       openpic_init(0);
-       /* The cascade is either on EPIC IRQ 1 or 2 on an X2 or on X3 it's
-        * on EPIC IRQ 0.
-        */
-       //openpic_hookup_cascade(SANDPOINT_SIO_IRQ, "8259 cascade to EPIC",
-       //              &i8259_irq);
-
-       /*
-        * openpic_init() has set up irq_desc[0-23] to be openpic
-        * interrupts.  We need to set irq_desc[0-15] to be 8259 interrupts.
-        * We then need to request and enable the 8259 irq.
-        */
-       //for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-       //      irq_desc[i].handler = &i8259_pic;
-
-       /*
-        * The EPIC allows for a read in the range of 0xFEF00000 ->
-        * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction.
-        */
-       //i8259_init(0xfef00000);
-#endif //REX:  
-}
-
-/*
- * Because the Sandpoint X2 has the i8259 cascade sharing an IRQ with a
- * PCI device, if we have a possible cascade IRQ we need to see if the
- * i8259 has something pending.  The only issue here is that the cascade
- * IRQs will get a higher priority than an OpenPIC one, but this should be
- * OK.
- */
-static int
-sandpoint_get_irq(struct pt_regs *regs)
-{
-        int irq, cascade_irq;
-
-       irq = openpic_irq();
-       //REX:
-#if 0
-       if ((irq != 127)&&(irq != 2)&&(irq!=121))
-               printk("sandpoint_get_irq: irq = %d\n", irq);
-#endif 
-       //if (irq == SANDPOINT_SIO_IRQ) 
-       //REX:
-       if (0)
-       {
-               cascade_irq = i8259_irq(regs);
-
-               if (cascade_irq != -1) {
-                       irq = cascade_irq;
-                       openpic_eoi();
-               }
-       } else if (irq == OPENPIC_VEC_SPURIOUS) 
-               irq = -1;
-
-       return irq;
-}
-//REX:
-#if 0
-static u32
-sandpoint_irq_cannonicalize(u32 irq)
-{
-       if (irq == 2)
-               return 9;
-       else
-               return irq;
-}
-#endif
-
-static unsigned long __init
-sandpoint_find_end_of_memory(void)
-{
-       bd_t *bp = (bd_t *) __res;
-
-       if (bp->bi_memsize)
-       {
-       //REX:  
-               printk("Total memory %d MB.\n", bp->bi_memsize);
-               return bp->bi_memsize;
-       }
-
-       /* This might be fixed in DINK32 12.4, or we'll have another
-        * way to determine the correct memory size anyhow. */
-       /* return mpc10x_get_mem_size(MPC10X_MEM_MAP_B); */
-       return 32 * 1024 * 1024;
-}
-
-static void __init
-sandpoint_map_io(void)
-{
-       io_block_mapping(0xfc000000, 0xfc000000, 0x04000000, _PAGE_IO);
-       //REX:
-       //rs_table[0].iomem_base = ioremap_base - 0x100000 + 0x4500; 
-}
-
-/*
- * Due to Sandpoint X2 errata, the Port 92 will not work.
- */
-static void
-sandpoint_restart(char *cmd)
-{
-       ulong msr, addr;
-       //printk("Jumping to start address...\n");
-
-       __cli();
-//REX:
-#if 1
-       /* Set exception prefix high - to the firmware */
-       _nmask_and_or_msr(0, MSR_IP);
-
-       /* Reset system via Port 92 */
-       //outb(0x00, 0x92);
-       //outb(0x01, 0x92);
-#endif
-
-        /* Interrupts and MMU off */
-        __asm__ ("mtspr    81, 0");
-
-        /* Interrupts and MMU off */
-        __asm__ __volatile__ ("mfmsr    %0":"=r" (msr):);
-
-        msr &= ~0x1030;
-        __asm__ __volatile__ ("mtmsr    %0"::"r" (msr));       
-        /*
-        *          * Trying to execute the next instruction at a non-existing address
-        *          * should cause a machine check, resulting in reset
-        **/
-               addr = 0xFFF00100;
-        ((void (*)(void)) addr) ();
-       for (;;) ;              /* Spin until reset happens */
-}
-
-static void
-sandpoint_power_off(void)
-{
-       __cli();
-       for (;;) ;              /* No way to shut power off with software */
-       /* NOTREACHED */
-}
-
-static void
-sandpoint_halt(void)
-{
-       sandpoint_power_off();
-       /* NOTREACHED */
-}
-
-static int
-sandpoint_show_cpuinfo(struct seq_file *m)
-{
-       seq_printf(m, "vendor\t\t: Motorola SPS\n");
-       seq_printf(m, "machine\t\t: Sandpoint\n");
-
-       return 0;
-}
-#if 0 //REX:
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
-/*
- * IDE support.
- */
-static int sandpoint_ide_ports_known = 0;
-static ide_ioreg_t sandpoint_ide_regbase[MAX_HWIFS];
-static ide_ioreg_t sandpoint_ide_ctl_regbase[MAX_HWIFS];
-static ide_ioreg_t sandpoint_idedma_regbase;
-
-static void
-sandpoint_ide_probe(void)
-{
-       struct pci_dev *pdev = pci_find_device(PCI_VENDOR_ID_WINBOND,
-                                              PCI_DEVICE_ID_WINBOND_82C105,
-                                              NULL);
-
-       if (pdev) {
-               sandpoint_ide_regbase[0] = pdev->resource[0].start;
-               sandpoint_ide_regbase[1] = pdev->resource[2].start;
-               sandpoint_ide_ctl_regbase[0] = pdev->resource[1].start;
-               sandpoint_ide_ctl_regbase[1] = pdev->resource[3].start;
-               sandpoint_idedma_regbase = pdev->resource[4].start;
-       }
-
-       sandpoint_ide_ports_known = 1;
-       return;
-}
-
-/* The Sandpoint X3 allows the IDE interrupt to be directly connected
- * from the Windbond (PCI INTC or INTD) to the serial EPIC.  Someday
- * we should try this, but it was easier to use the existing 83c553
- * initialization than change it to route the different interrupts :-).
- *     -- Dan
- */
-#if 0
-#define SANDPOINT_IDE_INT0     23      /* EPIC 7 */
-#define SANDPOINT_IDE_INT1     24      /* EPIC 8 */
-#else
-#define SANDPOINT_IDE_INT0     14      /* 8259 Test */
-#define SANDPOINT_IDE_INT1     15      /* 8259 Test */
-#endif
-static int
-sandpoint_ide_default_irq(ide_ioreg_t base)
-{
-       if (sandpoint_ide_ports_known == 0)
-               sandpoint_ide_probe();
-
-       if (base == sandpoint_ide_regbase[0])
-               return SANDPOINT_IDE_INT0;
-       else if (base == sandpoint_ide_regbase[1])
-               return SANDPOINT_IDE_INT1;
-       else
-               return 0;
-}
-
-static ide_ioreg_t
-sandpoint_ide_default_io_base(int index)
-{
-       if (sandpoint_ide_ports_known == 0)
-               sandpoint_ide_probe();
-
-       return sandpoint_ide_regbase[index];
-}
-
-static void __init
-sandpoint_ide_init_hwif_ports(hw_regs_t * hw, ide_ioreg_t data_port,
-                             ide_ioreg_t ctrl_port, int *irq)
-{
-       ide_ioreg_t reg = data_port;
-       unsigned int alt_status_base;
-       int i;
-
-       for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
-               hw->io_ports[i] = reg++;
-
-       if (data_port == sandpoint_ide_regbase[0]) {
-               alt_status_base = sandpoint_ide_ctl_regbase[0] + 2;
-               hw->irq = 14;
-       } else if (data_port == sandpoint_ide_regbase[1]) {
-               alt_status_base = sandpoint_ide_ctl_regbase[1] + 2;
-               hw->irq = 15;
-       } else {
-               alt_status_base = 0;
-               hw->irq = 0;
-       }
-
-       if (ctrl_port)
-               hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
-       else
-               hw->io_ports[IDE_CONTROL_OFFSET] = alt_status_base;
-
-       if (irq != NULL)
-               *irq = hw->irq;
-
-       return;
-}
-#endif
-#endif //REX:
-
-/*
- * Set BAT 3 to map 0xf8000000 to end of physical memory space 1-to-1.
- */
-static __inline__ void
-sandpoint_set_bat(void)
-{
-//REX:
-#if 0
-       mb();
-       mtspr(DBAT1U, 0xf8000ffe);
-       mtspr(DBAT1L, 0xf800002a);
-       mb();
-       unsigned long bat3u, bat3l;
-
-       __asm__ __volatile__(" lis %0,0xf800\n  \
-                       ori %1,%0,0x002a\n      \
-                       ori %0,%0,0x0ffe\n      \
-                       mtspr 0x21e,%0\n        \
-                       mtspr 0x21f,%1\n        \
-                       isync\n                 \
-                       sync ":"=r"(bat3u), "=r"(bat3l));
-#endif
-       unsigned long bat3u, bat3l;
-
-       __asm__ __volatile__(
-                       " lis %0,0xf000\n       \
-                       ori %1,%0,0x002a\n      \
-                       ori %0,%0,0x1fff\n      \
-                       mtspr 0x21e,%0\n        \
-                       mtspr 0x21f,%1\n        \
-                       isync\n                 \
-                       sync "
-                       : "=r" (bat3u), "=r" (bat3l));
-       
-       
-}
-
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/serial_reg.h>
-#include <asm/serial.h>
-
-
-volatile unsigned char *com_port;
-volatile unsigned char *com_port_lsr;
-
-static void
-serial_writechar(char c)
-{
-       while ((*com_port_lsr & UART_LSR_THRE) == 0)
-               ;
-       *com_port = c;
-}
-
-void
-sandpoint_progress(char *s, unsigned short hex)
-{
-       volatile char c;
-
-       //jackl
-       com_port = (volatile unsigned char *) rs_table[0].port;
-       //com_port = (volatile unsigned char *) rs_table[1].port;  //jackl
-       com_port_lsr = com_port + UART_LSR;
-
-       while ((c = *s++) != 0)
-               serial_writechar(c);
-
-       /* Most messages don't have a newline in them */
-       serial_writechar('\n');
-       serial_writechar('\r');
-}
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
-//REX: 
-void calibrate_decr() {                                                      
-       int freq, divisor;                                                   
-       
-       //jackl system_clock
-       #ifdef SYS_266
-       freq = 133000000;
-       #endif
-       #ifdef SYS_200
-       freq = 100000000;
-       #endif
-       #ifdef SYS_166
-       freq = 66000000;
-       #endif
-       //REX: to avoid slow time!
-       divisor = 4;                                                         
-       tb_ticks_per_jiffy = freq / HZ / divisor;                            
-       tb_to_us = mulhwu_scale_factor(freq / divisor, 1000000);             
-}                                                                            
-TODC_ALLOC();
-
-void __init
-platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-             unsigned long r6, unsigned long r7)
-{
-       parse_bootinfo(find_bootinfo());
-
-       /* ASSUMPTION:  If both r3 (bd_t pointer) and r6 (cmdline pointer)
-        * are non-zero, then we should use the board info from the bd_t
-        * structure and the cmdline pointed to by r6 instead of the
-        * information from birecs, if any.  Otherwise, use the information
-        * from birecs as discovered by the preceeding call to
-        * parse_bootinfo().  This rule should work with both PPCBoot, which
-        * uses a bd_t board info structure, and the kernel boot wrapper,
-        * which uses birecs.
-        */
-       if (r3 && r6) {
-               /* copy board info structure */
-               memcpy((void *) __res, (void *) (r3 + KERNELBASE),
-                      sizeof (bd_t));
-               /* copy command line */
-               *(char *) (r7 + KERNELBASE) = 0;
-               strcpy(cmd_line, (char *) (r6 + KERNELBASE));
-       }
-#ifdef CONFIG_BLK_DEV_INITRD
-       /* take care of initrd if we have one */
-       if (r4) {
-               initrd_start = r4 + KERNELBASE;
-               initrd_end = r5 + KERNELBASE;
-       }
-#endif                         /* CONFIG_BLK_DEV_INITRD */
-
-       /* Map in board regs, etc. */
-       sandpoint_set_bat();
-//REX:
-#if 0
-       isa_io_base = MPC10X_MAPB_ISA_IO_BASE;
-       isa_mem_base = MPC10X_MAPB_ISA_MEM_BASE;
-       pci_dram_offset = MPC10X_MAPB_DRAM_OFFSET;
-       ISA_DMA_THRESHOLD = 0x00ffffff;
-       DMA_MODE_READ = 0x44;
-       DMA_MODE_WRITE = 0x48;
-#endif
-       ppc_md.setup_arch = sandpoint_setup_arch;
-       ppc_md.show_cpuinfo = sandpoint_show_cpuinfo;
-       //ppc_md.irq_cannonicalize = sandpoint_irq_cannonicalize;
-       ppc_md.init_IRQ = sandpoint_init_IRQ;
-       //ppc_md.get_irq = openpic_get_irq;
-       ppc_md.get_irq = sandpoint_get_irq;
-       ppc_md.init = sandpoint_init2;
-
-       ppc_md.restart = sandpoint_restart;
-       ppc_md.power_off = sandpoint_power_off;
-       ppc_md.halt = sandpoint_halt;
-
-       ppc_md.find_end_of_memory = sandpoint_find_end_of_memory;
-       ppc_md.setup_io_mappings = sandpoint_map_io;
-       ppc_md.calibrate_decr = calibrate_decr;
-#ifdef REX_TODC
-       TODC_INIT(TODC_TYPE_PC97307, 0x70, 0x00, 0x71, 8);
-       ppc_md.time_init = todc_time_init;
-       ppc_md.set_rtc_time = todc_set_rtc_time;
-       ppc_md.get_rtc_time = todc_get_rtc_time;
-       ppc_md.calibrate_decr = todc_calibrate_decr;
-
-       ppc_md.nvram_read_val = todc_mc146818_read_val;
-       ppc_md.nvram_write_val = todc_mc146818_write_val;
-#endif
-
-#ifdef CONFIG_SERIAL
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-       //ppc_md.progress = gen550_progress;
-       ppc_md.progress = sandpoint_progress;
-#endif
-       ppc_md.early_serial_map = sandpoint_early_serial_map;
-#endif
-
-#ifdef CONFIG_VT
-       ppc_md.kbd_setkeycode = pckbd_setkeycode;
-       ppc_md.kbd_getkeycode = pckbd_getkeycode;
-       ppc_md.kbd_translate = pckbd_translate;
-       ppc_md.kbd_unexpected_up = pckbd_unexpected_up;
-       ppc_md.kbd_leds = pckbd_leds;
-       ppc_md.kbd_init_hw = pckbd_init_hw;
-#ifdef CONFIG_MAGIC_SYSRQ
-       ppc_md.ppc_kbd_sysrq_xlate = pckbd_sysrq_xlate;
-       SYSRQ_KEY = 0x54;
-#endif
-#endif
-
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
-       ppc_ide_md.default_irq = sandpoint_ide_default_irq;
-       ppc_ide_md.default_io_base = sandpoint_ide_default_io_base;
-       ppc_ide_md.ide_init_hwif = sandpoint_ide_init_hwif_ports;
-#endif
-
-       return;
-}
index 752d989..1d519bd 100644 (file)
@@ -350,8 +350,8 @@ typedef struct {
 #define        TODC_TYPE_MC146818_SECONDS              0x00
 #define        TODC_TYPE_MC146818_CNTL_B               0x0a
 #define        TODC_TYPE_MC146818_CNTL_A               0x0b    /* control_a R/W regs */
-#define        TODC_TYPE_MC146818_WATCHDOG             0
-#define        TODC_TYPE_MC146818_INTERRUPTS           0x0c
+#define        TODC_TYPE_MC146818_WATCHDOG             0x0c
+#define        TODC_TYPE_MC146818_INTERRUPTS           0x0d
 #define        TODC_TYPE_MC146818_ALARM_DATE           0xff
 #define        TODC_TYPE_MC146818_ALARM_HOUR           0x05
 #define        TODC_TYPE_MC146818_ALARM_MINUTES        0x03