git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
[pandora-kernel.git]
/
drivers
/
staging
/
octeon
/
cvmx-helper-board.c
diff --git
a/drivers/staging/octeon/cvmx-helper-board.c
b/drivers/staging/octeon/cvmx-helper-board.c
index
3085e38
..
00a555b
100644
(file)
--- a/
drivers/staging/octeon/cvmx-helper-board.c
+++ b/
drivers/staging/octeon/cvmx-helper-board.c
@@
-153,6
+153,14
@@
int cvmx_helper_board_get_mii_address(int ipd_port)
* through switch.
*/
return -1;
* through switch.
*/
return -1;
+
+ case CVMX_BOARD_TYPE_CUST_WSX16:
+ if (ipd_port >= 0 && ipd_port <= 3)
+ return ipd_port;
+ else if (ipd_port >= 16 && ipd_port <= 19)
+ return ipd_port - 16 + 4;
+ else
+ return -1;
}
/* Some unknown board. Somebody forgot to update this function... */
}
/* Some unknown board. Somebody forgot to update this function... */