diff options
author | David Daney <david.daney@cavium.com> | 2013-05-22 16:46:23 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-10 12:01:25 -0400 |
commit | 02a49d5144c58a2b9826946934533a7a9f28c2ec (patch) | |
tree | b25263de2c871b1e9427a98e213b0cd83920fd64 /arch/mips/cavium-octeon | |
parent | 9ddebc46e70b434e485060f7c1b53c5b848a6c8c (diff) |
MIPS: Octeon: Remove vestiges of CONFIG_CAVIUM_DECODE_RSL
This config option doesn't exist any more, remove the leftover code
for it too.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5302/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon')
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 01b1b3f94feb..0acc8ef86907 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -40,12 +40,6 @@ | |||
40 | #include <asm/octeon/pci-octeon.h> | 40 | #include <asm/octeon/pci-octeon.h> |
41 | #include <asm/octeon/cvmx-mio-defs.h> | 41 | #include <asm/octeon/cvmx-mio-defs.h> |
42 | 42 | ||
43 | #ifdef CONFIG_CAVIUM_DECODE_RSL | ||
44 | extern void cvmx_interrupt_rsl_decode(void); | ||
45 | extern int __cvmx_interrupt_ecc_report_single_bit_errors; | ||
46 | extern void cvmx_interrupt_rsl_enable(void); | ||
47 | #endif | ||
48 | |||
49 | extern struct plat_smp_ops octeon_smp_ops; | 43 | extern struct plat_smp_ops octeon_smp_ops; |
50 | 44 | ||
51 | #ifdef CONFIG_PCI | 45 | #ifdef CONFIG_PCI |
@@ -463,18 +457,6 @@ static void octeon_halt(void) | |||
463 | } | 457 | } |
464 | 458 | ||
465 | /** | 459 | /** |
466 | * Handle all the error condition interrupts that might occur. | ||
467 | * | ||
468 | */ | ||
469 | #ifdef CONFIG_CAVIUM_DECODE_RSL | ||
470 | static irqreturn_t octeon_rlm_interrupt(int cpl, void *dev_id) | ||
471 | { | ||
472 | cvmx_interrupt_rsl_decode(); | ||
473 | return IRQ_HANDLED; | ||
474 | } | ||
475 | #endif | ||
476 | |||
477 | /** | ||
478 | * Return a string representing the system type | 460 | * Return a string representing the system type |
479 | * | 461 | * |
480 | * Returns | 462 | * Returns |
@@ -1064,15 +1046,6 @@ void prom_free_prom_memory(void) | |||
1064 | panic("Core-14449 WAR not in place (%04x).\n" | 1046 | panic("Core-14449 WAR not in place (%04x).\n" |
1065 | "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).", insn); | 1047 | "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).", insn); |
1066 | } | 1048 | } |
1067 | #ifdef CONFIG_CAVIUM_DECODE_RSL | ||
1068 | cvmx_interrupt_rsl_enable(); | ||
1069 | |||
1070 | /* Add an interrupt handler for general failures. */ | ||
1071 | if (request_irq(OCTEON_IRQ_RML, octeon_rlm_interrupt, IRQF_SHARED, | ||
1072 | "RML/RSL", octeon_rlm_interrupt)) { | ||
1073 | panic("Unable to request_irq(OCTEON_IRQ_RML)"); | ||
1074 | } | ||
1075 | #endif | ||
1076 | } | 1049 | } |
1077 | 1050 | ||
1078 | int octeon_prune_device_tree(void); | 1051 | int octeon_prune_device_tree(void); |