summaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-18 13:32:17 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-18 13:32:17 +0000
commitb9fbaf87aaaedd80aaf31a524a7bd16c50ce6bff (patch)
treedceee2f5ad3f8444b9bc5920cc0a7a26db850cb4 /target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch
parent946c99ded8c232a805c0c98a34fe8befc5005a33 (diff)
[octeon]: upgrade to 2.6.37.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26227 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch')
-rw-r--r--target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch b/target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch
deleted file mode 100644
index 63f407d28..000000000
--- a/target/linux/octeon/patches-2.6.34/001-wndap330_hacks.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/drivers/staging/octeon/cvmx-helper-board.c
-+++ b/drivers/staging/octeon/cvmx-helper-board.c
-@@ -90,7 +90,7 @@ int cvmx_helper_board_get_mii_address(in
- case CVMX_BOARD_TYPE_KODAMA:
- case CVMX_BOARD_TYPE_EBH3100:
- case CVMX_BOARD_TYPE_HIKARI:
-- case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
-+ //case CVMX_BOARD_TYPE_CN3010_EVB_HS5: /* hack for the WNDAP330 */
- case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
- case CVMX_BOARD_TYPE_CN3020_EVB_HS5:
- /*
-@@ -103,6 +103,12 @@ int cvmx_helper_board_get_mii_address(in
- return 9;
- else
- return -1;
-+ case CVMX_BOARD_TYPE_CN3010_EVB_HS5: /* hack for the WNDAP330 */
-+ /* We have only one port, using GMII */
-+ if (ipd_port == 0)
-+ return 9;
-+ else
-+ return -1;
- case CVMX_BOARD_TYPE_NAC38:
- /* Board has 8 RGMII ports PHYs are 0-7 */
- if ((ipd_port >= 0) && (ipd_port < 4))
-@@ -213,7 +219,7 @@ cvmx_helper_link_info_t __cvmx_helper_bo
- result.s.speed = 1000;
- return result;
- case CVMX_BOARD_TYPE_EBH3100:
-- case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
-+ //case CVMX_BOARD_TYPE_CN3010_EVB_HS5: /* hack for the WNDAP330 */
- case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
- case CVMX_BOARD_TYPE_CN3020_EVB_HS5:
- /* Port 1 on these boards is always Gigabit */
-@@ -225,6 +231,9 @@ cvmx_helper_link_info_t __cvmx_helper_bo
- }
- /* Fall through to the generic code below */
- break;
-+ case CVMX_BOARD_TYPE_CN3010_EVB_HS5: /* hack for the WNDAP330 */
-+ is_broadcom_phy = 1;
-+ break;
- case CVMX_BOARD_TYPE_CUST_NB5:
- /* Port 1 on these boards is always Gigabit */
- if (ipd_port == 1) {
---- a/drivers/staging/octeon/cvmx-helper-rgmii.c
-+++ b/drivers/staging/octeon/cvmx-helper-rgmii.c
-@@ -66,13 +66,15 @@ int __cvmx_helper_rgmii_probe(int interf
- cvmx_dprintf("ERROR: RGMII initialize called in "
- "SPI interface\n");
- } else if (OCTEON_IS_MODEL(OCTEON_CN31XX)
-- || OCTEON_IS_MODEL(OCTEON_CN30XX)
-+ //|| OCTEON_IS_MODEL(OCTEON_CN30XX)
- || OCTEON_IS_MODEL(OCTEON_CN50XX)) {
- /*
- * On these chips "type" says we're in
- * GMII/MII mode. This limits us to 2 ports
- */
- num_ports = 2;
-+ } else if (OCTEON_IS_MODEL(OCTEON_CN30XX)) {
-+ num_ports = 1;
- } else {
- cvmx_dprintf("ERROR: Unsupported Octeon model in %s\n",
- __func__);
---- a/arch/mips/pci/pci-octeon.c
-+++ b/arch/mips/pci/pci-octeon.c
-@@ -210,9 +210,11 @@ const char *octeon_get_pci_interrupts(vo
- /* This is really the NAC38 */
- return "AAAAADABAAAAAAAAAAAAAAAAAAAAAAAA";
- case CVMX_BOARD_TYPE_EBH3100:
-- case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
-+ //case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
- case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
- return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-+ case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
-+ return "AAAAAAAAAAAAAABAAAAAAAAAAAAAAABA";
- case CVMX_BOARD_TYPE_BBGW_REF:
- return "AABCD";
- case CVMX_BOARD_TYPE_THUNDER: