MIPS: OCTEON: cvmx_gmxx_inf_mode: use oldest forward compatible definition

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

kernel os linux

Use oldest forward compatible definition.

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 7 years ago 036d0823 2bb17713

+3 -3

2 changed files

expand all

arch

mips

cavium-octeon

executive

cvmx-helper.c

cvmx-interrupt-rsl.c

+2 -2

arch/mips/cavium-octeon/executive/cvmx-helper.c

··· 218 218 mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface)); 219 219 220 220 if (OCTEON_IS_MODEL(OCTEON_CN63XX)) { 221 - switch (mode.cn63xx.mode) { 221 + switch (mode.cn61xx.mode) { 222 222 case 0: 223 223 return CVMX_HELPER_INTERFACE_MODE_SGMII; 224 224 case 1: ··· 342 342 mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface)); 343 343 344 344 if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX)) { 345 - switch (mode.cn56xx.mode) { 345 + switch (mode.cn52xx.mode) { 346 346 case 0: 347 347 return CVMX_HELPER_INTERFACE_MODE_DISABLED; 348 348 case 1:

+1 -1

arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c

··· 84 84 85 85 if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX)) { 86 86 if (mode.s.en) { 87 - switch (mode.cn56xx.mode) { 87 + switch (mode.cn52xx.mode) { 88 88 case 1: /* XAUI */ 89 89 num_ports = 1; 90 90 break;