mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
9a323b50e6
The kernel patches apply with only minor changes. The only other notable change is that octeon-usb has moved from staging and had its config macro renamed from CONFIG_OCTEON_USB to CONFIG_USB_OCTEON_HCD. Signed-off-by: Christian Svensson <blue@cmd.nu>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
@@ -297,6 +297,7 @@ enum cvmx_board_types_enum {
|
|
CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
|
|
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
+ CVMX_BOARD_TYPE_UBNT_USG = 20004,
|
|
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
|
CVMX_BOARD_TYPE_UBNT_E300 = 20300,
|
|
@@ -401,6 +402,7 @@ static inline const char *cvmx_board_typ
|
|
/* Customer private range */
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_USG)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
|
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
|
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
|
@@ -635,6 +635,7 @@ static void __init octeon_rx_tx_delay(in
|
|
}
|
|
break;
|
|
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
if (iface == 0 && port <= 2) {
|
|
_octeon_rx_tx_delay(eth, 0x0, 0x10);
|
|
return;
|
|
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
@@ -170,6 +170,7 @@ int cvmx_helper_board_get_mii_address(in
|
|
else
|
|
return -1;
|
|
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
if (ipd_port >= 0 && ipd_port <= 2)
|
|
return 7 - ipd_port;
|
|
else
|
|
@@ -337,6 +338,7 @@ enum cvmx_helper_board_usb_clock_types _
|
|
case CVMX_BOARD_TYPE_LANAI2_G:
|
|
case CVMX_BOARD_TYPE_NIC10E_66:
|
|
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
return USB_CLOCK_TYPE_CRYSTAL_12;
|
|
case CVMX_BOARD_TYPE_NIC10E:
|
|
return USB_CLOCK_TYPE_REF_12;
|