public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2009-04-20 21:34:36 +09:00
parent 37c8ac361e
commit 951a681bda
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/sh/drivers/pci/Kconfig
View file

@ -20,11 +20,8 @@ config SH_PCIDMA_NONCOHERENT
# Temporary config option for transitioning off of PCI_AUTO # Temporary config option for transitioning off of PCI_AUTO
config PCI_NEW config PCI_NEW
bool def_bool y
depends on PCI 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 # This is also board-specific
config PCI_AUTO config PCI_AUTO

2
arch/sh/drivers/pci/fixups-dreamcast.c
View file

@ -30,7 +30,7 @@
static void __init gapspci_fixup_resources(struct pci_dev *dev) 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)); printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev));

27
arch/sh/drivers/pci/pci-dreamcast.c
View file

@ -21,7 +21,6 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/pci.h> #include <mach/pci.h>
@ -40,11 +39,19 @@ static struct resource gapspci_mem_resource = {
.flags = IORESOURCE_MEM, .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 * gapspci init
*/ */
static int __init gapspci_init(struct pci_channel *chan) static int __init gapspci_init(void)
{ {
char idbuf[16]; char idbuf[16];
int i; int i;
@ -88,18 +95,8 @@ static int __init gapspci_init(struct pci_channel *chan)
outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10); outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);
outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14); outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);
register_pci_controller(&dreamcast_pci_controller);
return 0; return 0;
} }
arch_initcall(gapspci_init);
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,
}
};