From cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 12 Jan 2016 20:52:19 +0000
Subject: kernel/4.3: update to version 4.3.3

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de

SVN-Revision: 48224
---
 .../patches-4.3/100-ubnt_edgerouter2_support.patch | 36 +++++++++++-----------
 .../110-er200-ethernet_probe_order.patch           | 30 +++++++++---------
 ...add-host-driver-for-octeon-mmc-controller.patch | 10 +++---
 .../octeon/patches-4.3/160-cmdline-hack.patch      | 14 ++++-----
 4 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'target/linux/octeon')

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 0689949cb8..662fbd27f1 100644
--- 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;
diff --git a/target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
index b4a039ecc3..0bd8968a09 100644
--- a/target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
@@ -1,17 +1,17 @@
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
 @@ -663,6 +663,7 @@ static int cvm_oct_probe(struct platform
-	int interface;
-	int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
-	int qos;
+ 	int interface;
+ 	int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
+ 	int qos;
 +	int i;
-	struct device_node *pip;
-
-	octeon_mdiobus_force_mod_depencency();
+ 	struct device_node *pip;
+ 
+ 	octeon_mdiobus_force_mod_depencency();
 @@ -747,13 +748,19 @@ static int cvm_oct_probe(struct platform
-	}
-
-	num_interfaces = cvmx_helper_get_number_of_interfaces();
+ 	}
+ 
+ 	num_interfaces = cvmx_helper_get_number_of_interfaces();
 -	for (interface = 0; interface < num_interfaces; interface++) {
 -		cvmx_helper_interface_mode_t imode =
 -		    cvmx_helper_interface_get_mode(interface);
@@ -20,15 +20,15 @@
 +		cvmx_helper_interface_mode_t imode;
 +		int interface;
 +		int num_ports;
-		int port;
-		int port_index;
-
+ 		int port;
+ 		int port_index;
+ 
 +		interface = i;
 +		if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200)
 +			interface = num_interfaces - (i + 1);
 +
 +		num_ports = cvmx_helper_ports_on_interface(interface);
 +		imode = cvmx_helper_interface_get_mode(interface);
-		for (port_index = 0,
-		     port = cvmx_helper_get_ipd_port(interface, 0);
-		     port < cvmx_helper_get_ipd_port(interface, num_ports);
+ 		for (port_index = 0,
+ 		     port = cvmx_helper_get_ipd_port(interface, 0);
+ 		     port < cvmx_helper_get_ipd_port(interface, num_ports);
diff --git a/target/linux/octeon/patches-4.3/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch b/target/linux/octeon/patches-4.3/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch
index 53e0321178..62e5ef858a 100644
--- a/target/linux/octeon/patches-4.3/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch
+++ b/target/linux/octeon/patches-4.3/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch
@@ -73,9 +73,9 @@
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 @@ -436,6 +436,16 @@ config MMC_MXS
-
-	  If unsure, say N.
-
+ 
+ 	  If unsure, say N.
+ 
 +config MMC_OCTEON
 +	tristate "Cavium OCTEON Multimedia Card Interface support"
 +	depends on CAVIUM_OCTEON_SOC
@@ -87,8 +87,8 @@
 +	  If unsure, say N.
 +
  config MMC_TIFM_SD
-	tristate "TI Flash Media MMC/SD Interface support"
-	depends on PCI
+ 	tristate "TI Flash Media MMC/SD Interface support"
+ 	depends on PCI
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
 @@ -20,6 +20,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30)	+= sdhci
diff --git a/target/linux/octeon/patches-4.3/160-cmdline-hack.patch b/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
index fd17796829..6e042ef714 100644
--- a/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
+++ b/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
@@ -1,9 +1,9 @@
 --- a/arch/mips/cavium-octeon/setup.c
 +++ b/arch/mips/cavium-octeon/setup.c
 @@ -611,6 +611,35 @@ void octeon_user_io_init(void)
-	write_c0_derraddr1(0);
+ 	write_c0_derraddr1(0);
  }
-
+ 
 +#ifdef CONFIG_IMAGE_CMDLINE_HACK
 +extern char __image_cmdline[];
 +
@@ -37,11 +37,11 @@
   * Early entry point for arch setup
   */
 @@ -842,6 +871,8 @@ void __init prom_init(void)
-		}
-	}
-
+ 		}
+ 	}
+ 
 +	octeon_use_image_cmdline();
 +
-	if (strstr(arcs_cmdline, "console=") == NULL) {
+ 	if (strstr(arcs_cmdline, "console=") == NULL) {
  #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
-		strcat(arcs_cmdline, " console=ttyS0,115200");
+ 		strcat(arcs_cmdline, " console=ttyS0,115200");
-- 
cgit v1.2.3