diff options
| author | Chandrakala Chavva <cchavva@caviumnetworks.com> | 2015-03-06 14:02:21 +0300 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-03-25 13:47:59 +0100 |
| commit | 9a49899eb88803dcc0ef437f09912f9a7b7a66fd (patch) | |
| tree | d47cd172cec40c44ab3ef6346a79c5368e181e35 /arch/mips/cavium-octeon | |
| parent | a8667d706dfa394ef9fe5f9013dee92d40a096e8 (diff) | |
| download | op-kernel-dev-9a49899eb88803dcc0ef437f09912f9a7b7a66fd.zip op-kernel-dev-9a49899eb88803dcc0ef437f09912f9a7b7a66fd.tar.gz | |
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/cavium-octeon')
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index a42110e..a7f4082 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -413,7 +413,10 @@ static void octeon_restart(char *command) mb(); while (1) - cvmx_write_csr(CVMX_CIU_SOFT_RST, 1); + if (OCTEON_IS_OCTEON3()) + cvmx_write_csr(CVMX_RST_SOFT_RST, 1); + else + cvmx_write_csr(CVMX_CIU_SOFT_RST, 1); } |
