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

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

authored by

Aaro Koskinen and committed by
Paul Burton 2bb17713 1c6121c3

+6 -6
+6 -6
arch/mips/cavium-octeon/executive/octeon-model.c
··· 305 305 if (fus_dat3.s.nozip) 306 306 suffix = "SCP"; 307 307 308 - if (fus_dat3.cn56xx.bar2_en) 308 + if (fus_dat3.cn38xx.bar2_en) 309 309 suffix = "NSPB2"; 310 310 } 311 311 if (l2d_fus3) ··· 344 344 suffix = "CP"; 345 345 else if (fus_dat2.cn63xx.dorm_crypto) 346 346 suffix = "DAP"; 347 - else if (fus_dat3.cn63xx.nozip) 347 + else if (fus_dat3.cn61xx.nozip) 348 348 suffix = "SCP"; 349 349 else 350 350 suffix = "AAP"; ··· 359 359 suffix = "CP"; 360 360 else if (fus_dat2.cn66xx.dorm_crypto) 361 361 suffix = "DAP"; 362 - else if (fus_dat3.cn66xx.nozip) 362 + else if (fus_dat3.cn61xx.nozip) 363 363 suffix = "SCP"; 364 364 else 365 365 suffix = "AAP"; 366 366 break; 367 367 case 0x91: /* CN68XX */ 368 368 family = "68"; 369 - if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn68xx.nozip) 369 + if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn61xx.nozip) 370 370 suffix = "CP"; 371 371 else if (fus_dat2.cn68xx.dorm_crypto) 372 372 suffix = "DAP"; 373 - else if (fus_dat3.cn68xx.nozip) 373 + else if (fus_dat3.cn61xx.nozip) 374 374 suffix = "SCP"; 375 375 else if (fus_dat2.cn68xx.nocrypto) 376 376 suffix = "SP"; ··· 379 379 break; 380 380 case 0x94: /* CNF71XX */ 381 381 family = "F71"; 382 - if (fus_dat3.cnf71xx.nozip) 382 + if (fus_dat3.cn61xx.nozip) 383 383 suffix = "SCP"; 384 384 else 385 385 suffix = "AAP";