diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 12:49:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 12:49:04 -0400 |
| commit | dcf397f037f52add9945eced57ca300ab6a4413c (patch) | |
| tree | e78767d164589e9097a54bf564b072fb01f80820 /arch/sh/drivers/pci/pci-sh7780.c | |
| parent | 6faf035cf9fdd8283c2b2b2c34b76b5445ec6fc4 (diff) | |
| parent | 68ee0f9c98a42e36f9eab29155b2bb0e7e409ac6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (124 commits)
sh: allow building for both r2d boards in same binary.
sh: fix r2d board detection
sh: Discard .exit.text/.exit.data at runtime.
sh: Fix up some section alignments in linker script.
sh: Fix SH-4 DMAC CHCR masking.
sh: Rip out left-over nommu cond syscall cruft.
sh: Make kgdb i-cache flushing less inept.
sh: kgdb section mismatches and tidying.
sh: cleanup struct irqaction initializers.
sh: early_printk tidying.
video: pvr2fb: Add TV (RGB) support to Dreamcast PVR driver.
sh: Conditionalize gUSA support.
sh: Follow gUSA preempt changes in __switch_to().
sh: Tidy up gUSA preempt handling.
sh: __copy_user() optimizations for small copies.
sh: clkfwk: Support multi-level clock propagation.
sh: Fix URAM start address on SH7785.
sh: Use boot_cpu_data for CPU probe.
sh: Support extended mode TLB on SH-X3.
sh: Bump MAX_ACTIVE_REGIONS for SH7785.
...
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh7780.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7780.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c index 5508e45d4838..e516087fb435 100644 --- a/arch/sh/drivers/pci/pci-sh7780.c +++ b/arch/sh/drivers/pci/pci-sh7780.c | |||
| @@ -79,19 +79,6 @@ static int __init sh7780_pci_init(void) | |||
| 79 | ctrl_outl(0xAAAA0000, INTC_ICR1); | 79 | ctrl_outl(0xAAAA0000, INTC_ICR1); |
| 80 | /* INTPRI: priority=3(all) */ | 80 | /* INTPRI: priority=3(all) */ |
| 81 | ctrl_outl(0x33333333, INTC_INTPRI); | 81 | ctrl_outl(0x33333333, INTC_INTPRI); |
| 82 | } else { | ||
| 83 | /* INTC SH-4 Mode */ | ||
| 84 | ctrl_outl(0x00200000, INTC_ICR0); | ||
| 85 | /* enable PCIINTA - PCIINTD */ | ||
| 86 | ctrl_outl(0x00078000, INTC_INT2MSKCR); | ||
| 87 | /* disable IRL4-7 Interrupt */ | ||
| 88 | ctrl_outl(0x40000000, INTC_INTMSK1); | ||
| 89 | /* disable IRL4-7 Interrupt */ | ||
| 90 | ctrl_outl(0x0000fffe, INTC_INTMSK2); | ||
| 91 | /* enable IRL0-3 Interrupt */ | ||
| 92 | ctrl_outl(0x80000000, INTC_INTMSKCLR1); | ||
| 93 | /* enable IRL0-3 Interrupt */ | ||
| 94 | ctrl_outl(0xfffe0000, INTC_INTMSKCLR2); | ||
| 95 | } | 82 | } |
| 96 | 83 | ||
| 97 | if ((ret = sh4_pci_check_direct()) != 0) | 84 | if ((ret = sh4_pci_check_direct()) != 0) |