kernel: update kernel 4.4 to 4.4.56
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -28,7 +28,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||
if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) {
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -201,6 +201,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -190,6 +190,7 @@ void __init ralink_clk_init(void)
|
||||
ralink_clk_add("cpu", cpu_rate);
|
||||
ralink_clk_add("sys", sys_rate);
|
||||
ralink_clk_add("10000b00.spi", sys_rate);
|
||||
@@ -38,7 +38,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||
ralink_clk_add("10000500.uart", uart_rate);
|
||||
--- a/arch/mips/ralink/rt3883.c
|
||||
+++ b/arch/mips/ralink/rt3883.c
|
||||
@@ -109,6 +109,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -99,6 +99,7 @@ void __init ralink_clk_init(void)
|
||||
ralink_clk_add("10000120.watchdog", sys_rate);
|
||||
ralink_clk_add("10000500.uart", 40000000);
|
||||
ralink_clk_add("10000b00.spi", sys_rate);
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
--- a/arch/mips/ralink/prom.c
|
||||
+++ b/arch/mips/ralink/prom.c
|
||||
@@ -30,8 +30,10 @@ const char *get_system_type(void)
|
||||
return soc_info.sys_type;
|
||||
}
|
||||
|
||||
-static __init void prom_init_cmdline(int argc, char **argv)
|
||||
+static __init void prom_init_cmdline(void)
|
||||
{
|
||||
+ int argc;
|
||||
+ char **argv;
|
||||
int i;
|
||||
|
||||
pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
|
||||
@@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int
|
||||
|
||||
void __init prom_init(void)
|
||||
{
|
||||
- int argc;
|
||||
- char **argv;
|
||||
-
|
||||
prom_soc_init(&soc_info);
|
||||
|
||||
pr_info("SoC Type: %s\n", get_system_type());
|
||||
|
||||
- prom_init_cmdline(argc, argv);
|
||||
+ prom_init_cmdline();
|
||||
}
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||
|
||||
--- a/arch/mips/ralink/rt288x.c
|
||||
+++ b/arch/mips/ralink/rt288x.c
|
||||
@@ -119,5 +119,5 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
@@ -109,5 +109,5 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;
|
||||
|
||||
rt2880_pinmux_data = rt2880_pinmux_data_act;
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
ralink_clk_add("10000c00.uartlite", periph_rate);
|
||||
--- a/arch/mips/ralink/rt288x.c
|
||||
+++ b/arch/mips/ralink/rt288x.c
|
||||
@@ -75,6 +75,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -65,6 +65,7 @@ void __init ralink_clk_init(void)
|
||||
ralink_clk_add("300100.timer", cpu_rate / 2);
|
||||
ralink_clk_add("300120.watchdog", cpu_rate / 2);
|
||||
ralink_clk_add("300500.uart", cpu_rate / 2);
|
||||
@@ -45,7 +45,7 @@
|
||||
ralink_clk_add("480000.wmac", wmac_rate);
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -200,6 +200,8 @@ void __init ralink_clk_init(void)
|
||||
@@ -189,6 +189,8 @@ void __init ralink_clk_init(void)
|
||||
|
||||
ralink_clk_add("cpu", cpu_rate);
|
||||
ralink_clk_add("sys", sys_rate);
|
||||
@@ -56,7 +56,7 @@
|
||||
ralink_clk_add("10000100.timer", wdt_rate);
|
||||
--- a/arch/mips/ralink/rt3883.c
|
||||
+++ b/arch/mips/ralink/rt3883.c
|
||||
@@ -108,6 +108,8 @@ void __init ralink_clk_init(void)
|
||||
@@ -98,6 +98,8 @@ void __init ralink_clk_init(void)
|
||||
ralink_clk_add("10000100.timer", sys_rate);
|
||||
ralink_clk_add("10000120.watchdog", sys_rate);
|
||||
ralink_clk_add("10000500.uart", 40000000);
|
||||
|
||||
Reference in New Issue
Block a user