You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
1.9 KiB
86 lines
1.9 KiB
11 years ago
|
From 72578a46543821c5b9544842e45fcbed0c1b7eb8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Tue, 3 Dec 2013 13:35:12 +0100
|
||
|
|
Subject: [PATCH 3/8] MIPS: BCM63XX: remove !RUNTIME_DETECT from reset code
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/reset.c | 60 -----------------------------------------------
|
||
|
|
1 file changed, 60 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/reset.c
|
||
|
|
+++ b/arch/mips/bcm63xx/reset.c
|
||
|
|
@@ -125,8 +125,6 @@
|
||
|
|
#define BCM6368_RESET_PCIE 0
|
||
|
|
#define BCM6368_RESET_PCIE_EXT 0
|
||
|
|
|
||
|
|
-#ifdef BCMCPU_RUNTIME_DETECT
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* core reset bits
|
||
|
|
*/
|
||
|
|
@@ -188,64 +186,6 @@ static int __init bcm63xx_reset_bits_ini
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
-#else
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_3368
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(3368)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_6358_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6328
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6328)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_6328_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6338
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6338)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6345
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = { };
|
||
|
|
-#define reset_reg 0
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6348
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6348)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6358
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6358)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_6358_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6362
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6362)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_6362_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6368
|
||
|
|
-static const u32 bcm63xx_reset_bits[] = {
|
||
|
|
- __GEN_RESET_BITS_TABLE(6368)
|
||
|
|
-};
|
||
|
|
-#define reset_reg PERF_SOFTRESET_6368_REG
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-static int __init bcm63xx_reset_bits_init(void) { return 0; }
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
static DEFINE_SPINLOCK(reset_mutex);
|
||
|
|
|