diff options
author | Chandrakala Chavva <cchavva@caviumnetworks.com> | 2015-03-06 06:02:21 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-03-25 08:47:59 -0400 |
commit | 9a49899eb88803dcc0ef437f09912f9a7b7a66fd (patch) | |
tree | d47cd172cec40c44ab3ef6346a79c5368e181e35 /arch/mips/include/asm | |
parent | a8667d706dfa394ef9fe5f9013dee92d40a096e8 (diff) |
MIPS: OCTEON: Use correct CSR to soft reset
Also delete unused cvmx_reset_octeon()
This fixes reboot for Octeon III boards
Signed-off-by: Chandrakala Chavva <cchavva@caviumnetworks.com>
Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com>
Patchwork: https://patchwork.linux-mips.org/patch/9471/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r-- | arch/mips/include/asm/octeon/cvmx.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h index 33db1c806b01..774bb45834cb 100644 --- a/arch/mips/include/asm/octeon/cvmx.h +++ b/arch/mips/include/asm/octeon/cvmx.h | |||
@@ -436,14 +436,6 @@ static inline uint64_t cvmx_get_cycle_global(void) | |||
436 | 436 | ||
437 | /***************************************************************************/ | 437 | /***************************************************************************/ |
438 | 438 | ||
439 | static inline void cvmx_reset_octeon(void) | ||
440 | { | ||
441 | union cvmx_ciu_soft_rst ciu_soft_rst; | ||
442 | ciu_soft_rst.u64 = 0; | ||
443 | ciu_soft_rst.s.soft_rst = 1; | ||
444 | cvmx_write_csr(CVMX_CIU_SOFT_RST, ciu_soft_rst.u64); | ||
445 | } | ||
446 | |||
447 | /* Return the number of cores available in the chip */ | 439 | /* Return the number of cores available in the chip */ |
448 | static inline uint32_t cvmx_octeon_num_cores(void) | 440 | static inline uint32_t cvmx_octeon_num_cores(void) |
449 | { | 441 | { |