sh: pci: Convert dreamcast to new-style interface.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
index 5aaee3c707b0816626cc4d0a613e1639d7532256..1d53496b1498931ce58c72e815d57d3fe15fa5a1 100644 (file)
--- a/arch/sh/drivers/pci/Kconfig
+++ b/arch/sh/drivers/pci/Kconfig
@@ -20,11 +20,8 @@ config SH_PCIDMA_NONCOHERENT
 
 # Temporary config option for transitioning off of PCI_AUTO
 config PCI_NEW
-       bool
+       def_bool y
        depends on PCI
-       default y if CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7780 || \
-                    CPU_SUBTYPE_SH7785 || CPU_SH5 || \
-                    CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
 
 # This is also board-specific
 config PCI_AUTO

diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index 48c6381fffaaf1ee371c3941f497b4d3887956d2..ed7f489936f1e3075428434ef61b8f0739150084 100644 (file)
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -30,7 +30,7 @@
 
 static void __init gapspci_fixup_resources(struct pci_dev *dev)
 {
-       struct pci_channel *p = board_pci_channels;
+       struct pci_channel *p = dev->sysdata;
 
        printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev));
 

diff --git a/arch/sh/drivers/pci/pci-dreamcast.c b/arch/sh/drivers/pci/pci-dreamcast.c
index 0897be5053d49aff012cba331815dda199dbda64..210f9d4af1411c3aa0efe893302043c487e4d463 100644 (file)
--- a/arch/sh/drivers/pci/pci-dreamcast.c
+++ b/arch/sh/drivers/pci/pci-dreamcast.c
@@ -21,7 +21,6 @@
 #include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/module.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <mach/pci.h>
@@ -40,11 +39,19 @@ static struct resource gapspci_mem_resource = {
        .flags  = IORESOURCE_MEM,
 };
 
+static struct pci_channel dreamcast_pci_controller = {
+       .pci_ops        = &gapspci_pci_ops,
+       .io_resource    = &gapspci_io_resource,
+       .io_offset      = 0x00000000,
+       .mem_resource   = &gapspci_mem_resource,
+       .mem_offset     = 0x00000000,
+};
+
 /*
  * gapspci init
  */
 
-static int __init gapspci_init(struct pci_channel *chan)
+static int __init gapspci_init(void)
 {
        char idbuf[16];
        int i;
@@ -88,18 +95,8 @@ static int __init gapspci_init(struct pci_channel *chan)
        outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
        outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
 
+       register_pci_controller(&dreamcast_pci_controller);
+
        return 0;
 }
-
-struct pci_channel board_pci_channels[] = {
-       {
-               .init           = gapspci_init,
-               .pci_ops        = &gapspci_pci_ops,
-               .io_resource    = &gapspci_io_resource,
-               .mem_resource   = &gapspci_mem_resource,
-               .first_devfn    = 0,
-               .last_devfn     = 1,
-       }, {
-               .init           = NULL,
-       }
-};
+arch_initcall(gapspci_init);