kernel/4.3: update to version 4.3.3

[openwrt.git] / target / linux / octeon / patches-4.3 / 100-ubnt_edgerouter2_support.patch

diff --git a/target/linux/octeon/patches-4.3/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-4.3/100-ubnt_edgerouter2_support.patch
index 0689949..662fbd2 100644 (file)
--- a/target/linux/octeon/patches-4.3/100-ubnt_edgerouter2_support.patch
+++ b/target/linux/octeon/patches-4.3/100-ubnt_edgerouter2_support.patch
@@ -1,31 +1,31 @@
 --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
 @@ -283,6 +283,8 @@ enum cvmx_board_types_enum {
-        */
-       CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
-       CVMX_BOARD_TYPE_UBNT_E100 = 20002,
+        */
+       CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
+       CVMX_BOARD_TYPE_UBNT_E100 = 20002,
 +      CVMX_BOARD_TYPE_UBNT_E200 = 20003,
 +      CVMX_BOARD_TYPE_UBNT_E220 = 20005,
-       CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
-       CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
-       CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
+       CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
+       CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
+       CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
 @@ -384,6 +386,8 @@ 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)
+                   /* 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_E200)
 +              ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
-               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
+               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
+               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
+               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
 @@ -195,6 +195,8 @@ int cvmx_helper_board_get_mii_address(in
-                       return 8;
-               else
-                       return -1;
+                       return 8;
+               else
+                       return -1;
 +      case CVMX_BOARD_TYPE_UBNT_E200:
 +              return -1;
-       case CVMX_BOARD_TYPE_KONTRON_S1901:
-               if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
-                       return 1;
+       case CVMX_BOARD_TYPE_KONTRON_S1901:
+               if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
+                       return 1;