sh: Consolidated SH7751/SH7780 PCI support.
This cleans up quite a lot of the PCI mess that we currently have, and attempts to consolidate the duplication in the SH7780 and SH7751 PCI controllers. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -10,15 +10,12 @@
|
||||
*
|
||||
* PCI initialization for the Hitachi Big Sur Evaluation Board
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/pci.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include "pci-sh7751.h"
|
||||
#include "pci-sh4.h"
|
||||
#include <asm/bigsur/bigsur.h>
|
||||
|
||||
#define BIGSUR_PCI_IO 0x4000
|
||||
@@ -41,11 +38,11 @@ static struct resource sh7751_mem_resource = {
|
||||
extern struct pci_ops sh7751_pci_ops;
|
||||
|
||||
struct pci_channel board_pci_channels[] = {
|
||||
{ &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
|
||||
{ &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
|
||||
{ 0, }
|
||||
};
|
||||
|
||||
static struct sh7751_pci_address_map sh7751_pci_map = {
|
||||
static struct sh4_pci_address_map sh7751_pci_map = {
|
||||
.window0 = {
|
||||
.base = SH7751_CS3_BASE_ADDR,
|
||||
.size = BIGSUR_LSR0_SIZE,
|
||||
@@ -58,7 +55,7 @@ static struct sh7751_pci_address_map sh7751_pci_map = {
|
||||
};
|
||||
|
||||
/*
|
||||
* Initialize the Big Sur PCI interface
|
||||
* Initialize the Big Sur PCI interface
|
||||
* Setup hardware to be Central Funtion
|
||||
* Copy the BSR regs to the PCI interface
|
||||
* Setup PCI windows into local RAM
|
||||
@@ -68,15 +65,15 @@ int __init pcibios_init_platform(void)
|
||||
return sh7751_pcic_init(&sh7751_pci_map);
|
||||
}
|
||||
|
||||
int pcibios_map_platform_irq(u8 slot, u8 pin)
|
||||
int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
|
||||
{
|
||||
/*
|
||||
/*
|
||||
* The Big Sur can be used in a CPCI chassis, but the SH7751 PCI
|
||||
* interface is on the wrong end of the board so that it can also
|
||||
* support a V320 CPI interface chip... Therefor the IRQ mapping is
|
||||
* somewhat use dependent... I'l assume a linear map for now, i.e.
|
||||
* INTA=slot0,pin0... INTD=slot3,pin0...
|
||||
*/
|
||||
*/
|
||||
int irq = (slot + pin-1) % 4 + BIGSUR_SH7751_PCI_IRQ_BASE;
|
||||
|
||||
PCIDBG(2, "PCI: Mapping Big Sur IRQ for slot %d, pin %c to irq %d\n",
|
||||
@@ -84,4 +81,3 @@ int pcibios_map_platform_irq(u8 slot, u8 pin)
|
||||
|
||||
return irq;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user