aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/pci
diff options
context:
space:
mode:
authorRyusuke Sakato <sakato.ryusuke@renesas.com>2007-05-07 10:48:56 +0900
committerPaul Mundt <lethal@hera.kernel.org>2007-05-07 02:11:57 +0000
commit39374aadcd0159b4744ab456f4efa100bea84bd4 (patch)
treeabc7f4066e3404cf12e50688f558e0f9afd1de9d /arch/sh/drivers/pci
parent9c37dc633016e9ebdc39adba0737b390e0de1507 (diff)
downloadkernel_samsung_aries-39374aadcd0159b4744ab456f4efa100bea84bd4.zip
kernel_samsung_aries-39374aadcd0159b4744ab456f4efa100bea84bd4.tar.gz
kernel_samsung_aries-39374aadcd0159b4744ab456f4efa100bea84bd4.tar.bz2
sh: R7785RP board updates.
Some fixups for the R7785RP board. Gets iVDR working. Signed-off-by: Ryusuke Sakato <sakato.ryusuke@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/pci')
-rw-r--r--arch/sh/drivers/pci/ops-r7780rp.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
index 6f4fb38..f221608 100644
--- a/arch/sh/drivers/pci/ops-r7780rp.c
+++ b/arch/sh/drivers/pci/ops-r7780rp.c
@@ -25,22 +25,12 @@ static char r7780mp_irq_tab[] __initdata = {
65, 66, 67, 68,
};
-static char r7785rp_irq_tab[][4] __initdata = {
- { 65, 66, 67, 68 }, /* INT ABCD */
- { 66, 67, 68, 65 }, /* INT BCDA */
- { 67, 68, 65, 66 }, /* INT CDAB */
- { 68, 65, 66, 67 }, /* INT DABC */
- { 64, 64, 64, 64 }, /* PCI Host */
-};
-
int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
{
if (mach_is_r7780rp())
return r7780rp_irq_tab[slot];
- if (mach_is_r7780mp())
+ if (mach_is_r7780mp() || mach_is_r7785rp())
return r7780mp_irq_tab[slot];
- if (mach_is_r7785rp())
- return r7785rp_irq_tab[slot][pin];
printk(KERN_ERR "PCI: Bad IRQ mapping "
"request for slot %d, func %d\n", slot, pin-1);