Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: BCM63xx: Remove !RUNTIME_DETECT from reset code

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: John Crispin <blogic@openwrt.org>
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: Florian Fainelli <florian@openwrt.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7268/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Jonas Gorski and committed by
Ralf Baechle
fe0a5f1c 9bd9f9cb

-60
-60
arch/mips/bcm63xx/reset.c
··· 125 125 #define BCM6368_RESET_PCIE 0 126 126 #define BCM6368_RESET_PCIE_EXT 0 127 127 128 - #ifdef BCMCPU_RUNTIME_DETECT 129 - 130 128 /* 131 129 * core reset bits 132 130 */ ··· 186 188 187 189 return 0; 188 190 } 189 - #else 190 - 191 - #ifdef CONFIG_BCM63XX_CPU_3368 192 - static const u32 bcm63xx_reset_bits[] = { 193 - __GEN_RESET_BITS_TABLE(3368) 194 - }; 195 - #define reset_reg PERF_SOFTRESET_6358_REG 196 - #endif 197 - 198 - #ifdef CONFIG_BCM63XX_CPU_6328 199 - static const u32 bcm63xx_reset_bits[] = { 200 - __GEN_RESET_BITS_TABLE(6328) 201 - }; 202 - #define reset_reg PERF_SOFTRESET_6328_REG 203 - #endif 204 - 205 - #ifdef CONFIG_BCM63XX_CPU_6338 206 - static const u32 bcm63xx_reset_bits[] = { 207 - __GEN_RESET_BITS_TABLE(6338) 208 - }; 209 - #define reset_reg PERF_SOFTRESET_REG 210 - #endif 211 - 212 - #ifdef CONFIG_BCM63XX_CPU_6345 213 - static const u32 bcm63xx_reset_bits[] = { }; 214 - #define reset_reg 0 215 - #endif 216 - 217 - #ifdef CONFIG_BCM63XX_CPU_6348 218 - static const u32 bcm63xx_reset_bits[] = { 219 - __GEN_RESET_BITS_TABLE(6348) 220 - }; 221 - #define reset_reg PERF_SOFTRESET_REG 222 - #endif 223 - 224 - #ifdef CONFIG_BCM63XX_CPU_6358 225 - static const u32 bcm63xx_reset_bits[] = { 226 - __GEN_RESET_BITS_TABLE(6358) 227 - }; 228 - #define reset_reg PERF_SOFTRESET_6358_REG 229 - #endif 230 - 231 - #ifdef CONFIG_BCM63XX_CPU_6362 232 - static const u32 bcm63xx_reset_bits[] = { 233 - __GEN_RESET_BITS_TABLE(6362) 234 - }; 235 - #define reset_reg PERF_SOFTRESET_6362_REG 236 - #endif 237 - 238 - #ifdef CONFIG_BCM63XX_CPU_6368 239 - static const u32 bcm63xx_reset_bits[] = { 240 - __GEN_RESET_BITS_TABLE(6368) 241 - }; 242 - #define reset_reg PERF_SOFTRESET_6368_REG 243 - #endif 244 - 245 - static int __init bcm63xx_reset_bits_init(void) { return 0; } 246 - #endif 247 191 248 192 static DEFINE_SPINLOCK(reset_mutex); 249 193