Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146649
b: refs/heads/master
c: 4c7a47d
h: refs/heads/master
i:
  146647: 9c0661e
v: v3
  • Loading branch information
Paul Mundt committed Apr 17, 2009
1 parent 7ea7b89 commit 551199a
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 96 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ab1363a8929f32cc163cd3f50ca72f20d901b00c
refs/heads/master: 4c7a47de897e89c25a40e228ac5319cbac7257fe
17 changes: 17 additions & 0 deletions trunk/arch/sh/boards/mach-se/7780/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,21 @@ void __init init_se7780_IRQ(void)

/* ICR1: detect low level(for 2ndcut) */
ctrl_outl(0xAAAA0000, INTC_ICR1);

/*
* FPGA PCISEL register initialize
*
* CPU || SLOT1 | SLOT2 | S-ATA | USB
* -------------------------------------
* INTA || INTA | INTD | -- | INTB
* -------------------------------------
* INTB || INTB | INTA | -- | INTC
* -------------------------------------
* INTC || INTC | INTB | INTA | --
* -------------------------------------
* INTD || INTD | INTC | -- | INTA
* -------------------------------------
*/
ctrl_outw(0x0013, FPGA_PCI_INTSEL1);
ctrl_outw(0xE402, FPGA_PCI_INTSEL2);
}
17 changes: 0 additions & 17 deletions trunk/arch/sh/drivers/pci/ops-r7780rp.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
{
return irq_tab[slot];
}

static struct sh4_pci_address_map sh7780_pci_map = {
.window0 = {
.base = SH7780_CS2_BASE_ADDR,
.size = 0x04000000,
},

.window1 = {
.base = SH7780_CS3_BASE_ADDR,
.size = 0x04000000,
},
};

int __init pcibios_init_platform(void)
{
return sh7780_pcic_init(&sh7780_pci_map);
}
17 changes: 0 additions & 17 deletions trunk/arch/sh/drivers/pci/ops-sdk7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
{
return sdk7780_irq_tab[pin-1][slot];
}

static struct sh4_pci_address_map sdk7780_pci_map = {
.window0 = {
.base = SH7780_CS2_BASE_ADDR,
.size = 0x04000000,
},
.window1 = {
.base = SH7780_CS3_BASE_ADDR,
.size = 0x04000000,
},
};

int __init pcibios_init_platform(void)
{
printk(KERN_INFO "SH7780 PCI: Finished initializing PCI controller\n");
return sh7780_pcic_init(&sdk7780_pci_map);
}
31 changes: 0 additions & 31 deletions trunk/arch/sh/drivers/pci/ops-se7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
{
return se7780_irq_tab[pin-1][slot];
}

static struct sh4_pci_address_map se7780_pci_map = {
.window0 = {
.base = SH7780_CS2_BASE_ADDR,
.size = 0x04000000,
},
};

int __init pcibios_init_platform(void)
{
printk("SH7780 PCI: Finished initialization of the PCI controller\n");

/*
* FPGA PCISEL register initialize
*
* CPU || SLOT1 | SLOT2 | S-ATA | USB
* -------------------------------------
* INTA || INTA | INTD | -- | INTB
* -------------------------------------
* INTB || INTB | INTA | -- | INTC
* -------------------------------------
* INTC || INTC | INTB | INTA | --
* -------------------------------------
* INTD || INTD | INTC | -- | INTA
* -------------------------------------
*/
ctrl_outw(0x0013, FPGA_PCI_INTSEL1);
ctrl_outw(0xE402, FPGA_PCI_INTSEL2);

return sh7780_pcic_init(&se7780_pci_map);
}
17 changes: 0 additions & 17 deletions trunk/arch/sh/drivers/pci/ops-sh7785lcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,3 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
{
return irq_tab[slot];
}

static struct sh4_pci_address_map sh7785_pci_map = {
.window0 = {
#if defined(CONFIG_32BIT)
.base = SH7780_32BIT_DDR_BASE_ADDR,
.size = 0x40000000,
#else
.base = SH7780_CS0_BASE_ADDR,
.size = 0x20000000,
#endif
},
};

int __init pcibios_init_platform(void)
{
return sh7780_pcic_init(&sh7785_pci_map);
}
24 changes: 16 additions & 8 deletions trunk/arch/sh/drivers/pci/pci-sh7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,19 @@ struct pci_channel board_pci_channels[] = {
{ NULL, NULL, NULL, 0, 0 },
};

int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
static struct sh4_pci_address_map sh7780_pci_map = {
.window0 = {
#if defined(CONFIG_32BIT)
.base = SH7780_32BIT_DDR_BASE_ADDR,
.size = 0x40000000,
#else
.base = SH7780_CS0_BASE_ADDR,
.size = 0x20000000,
#endif
},
};

int __init pcibios_init_platform(void)
{
struct pci_channel *chan = &board_pci_channels[0];
u32 word;
Expand All @@ -114,14 +126,10 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
/* Set IO and Mem windows to local address
* Make PCI and local address the same for easy 1 to 1 mapping
*/
pci_write_reg(chan, map->window0.size - 0xfffff, SH4_PCILSR0);
pci_write_reg(chan, map->window1.size - 0xfffff, SH4_PCILSR1);
pci_write_reg(chan, sh7780_pci_map.window0.size - 0xfffff, SH4_PCILSR0);
/* Set the values on window 0 PCI config registers */
pci_write_reg(chan, map->window0.base, SH4_PCILAR0);
pci_write_reg(chan, map->window0.base, SH7780_PCIMBAR0);
/* Set the values on window 1 PCI config registers */
pci_write_reg(chan, map->window1.base, SH4_PCILAR1);
pci_write_reg(chan, map->window1.base, SH7780_PCIMBAR1);
pci_write_reg(chan, sh7780_pci_map.window0.base, SH4_PCILAR0);
pci_write_reg(chan, sh7780_pci_map.window0.base, SH7780_PCIMBAR0);

/* Apply any last-minute PCIC fixups */
pci_fixup_pcic(chan);
Expand Down
5 changes: 0 additions & 5 deletions trunk/arch/sh/drivers/pci/pci-sh7780.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,4 @@

#define SH7780_32BIT_DDR_BASE_ADDR 0x40000000

struct sh4_pci_address_map;

/* arch/sh/drivers/pci/pci-sh7780.c */
int sh7780_pcic_init(struct sh4_pci_address_map *map);

#endif /* _PCI_SH7780_H_ */

0 comments on commit 551199a

Please sign in to comment.