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

MIPS: Octeon: Fix management port MII address on Kontron S1901

Management port MII address is incorrect on Kontron S1901 resulting
in broken networking. Fix by providing definitions for the in-tree DT
pruning code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10914/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Aaro Koskinen and committed by
Ralf Baechle
cef232ec e5dd8f2c

+8
+6
arch/mips/cavium-octeon/executive/cvmx-helper-board.c
··· 195 195 return 8; 196 196 else 197 197 return -1; 198 + case CVMX_BOARD_TYPE_KONTRON_S1901: 199 + if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT) 200 + return 1; 201 + else 202 + return -1; 203 + 198 204 } 199 205 200 206 /* Some unknown board. Somebody forgot to update this function... */
+2
arch/mips/include/asm/octeon/cvmx-bootinfo.h
··· 284 284 CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001, 285 285 CVMX_BOARD_TYPE_UBNT_E100 = 20002, 286 286 CVMX_BOARD_TYPE_CUST_DSR1000N = 20006, 287 + CVMX_BOARD_TYPE_KONTRON_S1901 = 21901, 287 288 CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000, 288 289 289 290 /* The remaining range is reserved for future use. */ ··· 385 384 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN) 386 385 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100) 387 386 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N) 387 + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901) 388 388 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX) 389 389 } 390 390 return "Unsupported Board";