octeon: refresh patches for kernel 5.4

Refresh patches to make them apply to kernel 5.4.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
[split patch, refresh on newer kernel, add description]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Daniel Engberg 2020-04-17 21:56:37 +02:00 committed by Adrian Schmutzler
parent 91594cb137
commit 655c14e88c
3 changed files with 5 additions and 5 deletions

View File

@ -20,7 +20,7 @@
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
@@ -173,6 +173,8 @@ int cvmx_helper_board_get_mii_address(in
@@ -174,6 +174,8 @@ int cvmx_helper_board_get_mii_address(in
return 7 - ipd_port;
else
return -1;

View File

@ -1,6 +1,6 @@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -670,6 +670,7 @@ static int cvm_oct_probe(struct platform
@@ -682,6 +682,7 @@ static int cvm_oct_probe(struct platform
int interface;
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
int qos;
@ -8,7 +8,7 @@
struct device_node *pip;
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
@@ -793,13 +794,19 @@ static int cvm_oct_probe(struct platform
@@ -805,13 +806,19 @@ static int cvm_oct_probe(struct platform
}
num_interfaces = cvmx_helper_get_number_of_interfaces();

View File

@ -1,6 +1,6 @@
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -651,6 +651,35 @@ void octeon_user_io_init(void)
@@ -653,6 +653,35 @@ void octeon_user_io_init(void)
write_c0_derraddr1(0);
}
@ -36,7 +36,7 @@
/**
* Early entry point for arch setup
*/
@@ -895,6 +924,8 @@ void __init prom_init(void)
@@ -897,6 +926,8 @@ void __init prom_init(void)
}
}