MIPS: OCTEON: cvmx_mio_fus_dat3: use oldest forward compatible definition

Chips up to cn5xxx are compatible with cn38xx. All cn6xxx chips, and also
cnf71xx, are compatible with cn61xx.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org

diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c
index 341052387b49dbcd15833f0f802c8d71e7e22a00..657dbad9644e9e53b5b455e92011c70161b71728 100644 (file)
--- a/arch/mips/cavium-octeon/executive/octeon-model.c
+++ b/arch/mips/cavium-octeon/executive/octeon-model.c
@@ -305,7 +305,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
                                if (fus_dat3.s.nozip)
                                        suffix = "SCP";
 
-                               if (fus_dat3.cn56xx.bar2_en)
+                               if (fus_dat3.cn38xx.bar2_en)
                                        suffix = "NSPB2";
                        }
                        if (l2d_fus3)
@@ -344,7 +344,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
                        suffix = "CP";
                else if (fus_dat2.cn63xx.dorm_crypto)
                        suffix = "DAP";
-               else if (fus_dat3.cn63xx.nozip)
+               else if (fus_dat3.cn61xx.nozip)
                        suffix = "SCP";
                else
                        suffix = "AAP";
@@ -359,18 +359,18 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
                        suffix = "CP";
                else if (fus_dat2.cn66xx.dorm_crypto)
                        suffix = "DAP";
-               else if (fus_dat3.cn66xx.nozip)
+               else if (fus_dat3.cn61xx.nozip)
                        suffix = "SCP";
                else
                        suffix = "AAP";
                break;
        case 0x91:              /* CN68XX */
                family = "68";
-               if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn68xx.nozip)
+               if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn61xx.nozip)
                        suffix = "CP";
                else if (fus_dat2.cn68xx.dorm_crypto)
                        suffix = "DAP";
-               else if (fus_dat3.cn68xx.nozip)
+               else if (fus_dat3.cn61xx.nozip)
                        suffix = "SCP";
                else if (fus_dat2.cn68xx.nocrypto)
                        suffix = "SP";
@@ -379,7 +379,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
                break;
        case 0x94:              /* CNF71XX */
                family = "F71";
-               if (fus_dat3.cnf71xx.nozip)
+               if (fus_dat3.cn61xx.nozip)
                        suffix = "SCP";
                else
                        suffix = "AAP";