OMAP3: PM: Fix for MPU power domain MEM BANK position

[safe/jmp/linux-2.6] / arch / sh / drivers / pci / ops-dreamcast.c

diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index 0dac87b..16e0a1b 100644 (file)
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -1,15 +1,9 @@
 /*
- * arch/sh/drivers/pci/ops-dreamcast.c
- *
  * PCI operations for the Sega Dreamcast
  *
  * Copyright (C) 2001, 2002  M. R. Brown
  * Copyright (C) 2002, 2003  Paul Mundt
  *
- * This file originally bore the message (with enclosed-$):
- *     Id: pci.c,v 1.3 2003/05/04 19:29:46 lethal Exp
- *     Dreamcast PCI: Supports SEGA Broadband Adaptor only.
- *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -22,32 +16,9 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/pci.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-
-static struct resource gapspci_io_resource = {
-       .name   = "GAPSPCI IO",
-       .start  = GAPSPCI_BBA_CONFIG,
-       .end    = GAPSPCI_BBA_CONFIG + GAPSPCI_BBA_CONFIG_SIZE - 1,
-       .flags  = IORESOURCE_IO,
-};
-
-static struct resource gapspci_mem_resource = {
-       .name   = "GAPSPCI mem",
-       .start  = GAPSPCI_DMA_BASE,
-       .end    = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1,
-       .flags  = IORESOURCE_MEM,
-};
-
-static struct pci_ops gapspci_pci_ops;
-
-struct pci_channel board_pci_channels[] = {
-       { &gapspci_pci_ops, &gapspci_io_resource,
-         &gapspci_mem_resource, 0, 1 },
-       { 0, }
-};
+#include <linux/module.h>
+#include <linux/io.h>
+#include <mach/pci.h>
 
 /*
  * The !gapspci_config_access case really shouldn't happen, ever, unless
@@ -83,10 +54,10 @@ static int gapspci_read(struct pci_bus *bus, unsigned int devfn, int where, int
                return PCIBIOS_DEVICE_NOT_FOUND;
 
        switch (size) {
-               case 1: *val = ctrl_inb(GAPSPCI_BBA_CONFIG+where); break;
-               case 2: *val = ctrl_inw(GAPSPCI_BBA_CONFIG+where); break;
-               case 4: *val = ctrl_inl(GAPSPCI_BBA_CONFIG+where); break;
-       }       
+       case 1: *val = inb(GAPSPCI_BBA_CONFIG+where); break;
+       case 2: *val = inw(GAPSPCI_BBA_CONFIG+where); break;
+       case 4: *val = inl(GAPSPCI_BBA_CONFIG+where); break;
+       }
 
         return PCIBIOS_SUCCESSFUL;
 }
@@ -97,72 +68,15 @@ static int gapspci_write(struct pci_bus *bus, unsigned int devfn, int where, int
                return PCIBIOS_DEVICE_NOT_FOUND;
 
        switch (size) {
-               case 1: ctrl_outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;
-               case 2: ctrl_outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;
-               case 4: ctrl_outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;
+       case 1: outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;
+       case 2: outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;
+       case 4: outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;
        }
 
         return PCIBIOS_SUCCESSFUL;
 }
 
-static struct pci_ops gapspci_pci_ops = {
+struct pci_ops gapspci_pci_ops = {
        .read   = gapspci_read,
        .write  = gapspci_write,
 };
-
-/*
- * gapspci init
- */
-
-int __init gapspci_init(void)
-{
-       char idbuf[16];
-       int i;
-
-       /*
-        * FIXME: All of this wants documenting to some degree,
-        * even some basic register definitions would be nice.
-        *
-        * I haven't seen anything this ugly since.. maple.
-        */
-
-       for (i=0; i<16; i++)
-               idbuf[i] = ctrl_inb(GAPSPCI_REGS+i);
-
-       if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16))
-               return -ENODEV;
-
-       ctrl_outl(0x5a14a501, GAPSPCI_REGS+0x18);
-
-       for (i=0; i<1000000; i++)
-               ;
-
-       if (ctrl_inl(GAPSPCI_REGS+0x18) != 1)
-               return -EINVAL;
-
-       ctrl_outl(0x01000000, GAPSPCI_REGS+0x20);
-       ctrl_outl(0x01000000, GAPSPCI_REGS+0x24);
-
-       ctrl_outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);
-       ctrl_outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);
-
-       ctrl_outl(1, GAPSPCI_REGS+0x14);
-       ctrl_outl(1, GAPSPCI_REGS+0x34);
-
-       /* Setting Broadband Adapter */
-       ctrl_outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);
-       ctrl_outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);
-       ctrl_outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);
-       ctrl_outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);
-       ctrl_outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);
-       ctrl_outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
-       ctrl_outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
-
-       return 0;
-}
-
-/* Haven't done anything here as yet */
-char * __devinit pcibios_setup(char *str)
-{
-       return str;
-}