ar7: update kernel to version 4.14
This adds support for kernel 4.14 to the target and directly make it the default kernel version to use. This patch is build-tested only, but has never been device-tested. It is only added to preserve the changes in Git history prior to removing this target. Use it with care. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [rebased and extended commit message, refreshed patches for 4.14.162] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>master
Hauke Mehrtens
5 years ago
committed by
Adrian Schmutzler
parent
08ec23f8ea
commit
90740f52e9
@ -0,0 +1,51 @@
|
||||
--- a/tn7atm.c
|
||||
+++ b/tn7atm.c
|
||||
@@ -1149,7 +1149,7 @@ void tn7atm_close (struct atm_vcc *vcc)
|
||||
Tn7AtmPrivate *priv;
|
||||
int dmachan;
|
||||
spinlock_t closeLock;
|
||||
- unsigned int closeFlag;
|
||||
+ unsigned long closeFlag;
|
||||
int rc;
|
||||
|
||||
priv = (Tn7AtmPrivate *) vcc->dev->dev_data;
|
||||
--- a/tn7dsl.c
|
||||
+++ b/tn7dsl.c
|
||||
@@ -620,7 +620,7 @@ unsigned int shim_osClockTick(void)
|
||||
return jiffies;
|
||||
}
|
||||
|
||||
-int flags;
|
||||
+unsigned long flags;
|
||||
spinlock_t shimLock;
|
||||
|
||||
void shim_osCriticalEnter(void)
|
||||
@@ -3433,7 +3433,7 @@ struct ctl_table dslmod_table[] = {
|
||||
.extra2 = (void *)DEV_DSLMOD,
|
||||
}
|
||||
,
|
||||
- {0}
|
||||
+ { }
|
||||
};
|
||||
|
||||
/* Make sure that /proc/sys/dev is there */
|
||||
@@ -3447,7 +3447,7 @@ struct ctl_table dslmod_root_table[] = {
|
||||
}
|
||||
,
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
- {0}
|
||||
+ { }
|
||||
};
|
||||
|
||||
static struct ctl_table_header *dslmod_sysctl_header;
|
||||
--- a/tn7sar.c
|
||||
+++ b/tn7sar.c
|
||||
@@ -1208,7 +1208,7 @@ int tn7sar_deactivate_vc(Tn7AtmPrivate *
|
||||
HAL_FUNCTIONS *pHalFunc;
|
||||
HAL_DEVICE *pHalDev;
|
||||
int rc;
|
||||
- int flags;
|
||||
+ unsigned long flags;
|
||||
|
||||
//dgprintf(4, "tn7sar_deactivate_vc\n");
|
||||
//printk("tn7sar_deactivate_vc entered\n");
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/ar7/memory.c
|
||||
+++ b/arch/mips/ar7/memory.c
|
||||
@@ -66,5 +66,11 @@ void __init prom_meminit(void)
|
||||
@@ -65,5 +65,11 @@ void __init prom_meminit(void)
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
{
|
||||
@ -1,45 +0,0 @@
|
||||
From patchwork Tue Jul 18 10:17:26 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [5/9] MIPS: AR7: allow NULL clock for clk_get_rate
|
||||
X-Patchwork-Submitter: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
X-Patchwork-Id: 16775
|
||||
Message-Id: <20170718101730.2541-6-jonas.gorski@gmail.com>
|
||||
To: unlisted-recipients:; (no To-header on input)
|
||||
Cc: Ralf Baechle <ralf@linux-mips.org>,
|
||||
Paul Gortmaker <paul.gortmaker@windriver.com>,
|
||||
James Hogan <james.hogan@imgtec.com>,
|
||||
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
|
||||
Date: Tue, 18 Jul 2017 12:17:26 +0200
|
||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
List-Id: linux-mips <linux-mips.eddie.linux-mips.org>
|
||||
|
||||
Make the behaviour of clk_get_rate consistent with common clk's
|
||||
clk_get_rate by accepting NULL clocks as parameter. Some device
|
||||
drivers rely on this, and will cause an OOPS otherwise.
|
||||
|
||||
Fixes: 780019ddf02f ("MIPS: AR7: Implement clock API")
|
||||
Cc: Ralf Baechle <ralf@linux-mips.org>
|
||||
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
Cc: James Hogan <james.hogan@imgtec.com>
|
||||
Cc: linux-mips@linux-mips.org
|
||||
Cc: linux-kernel@vger.kernel.org
|
||||
Reported-by: Mathias Kresin <dev@kresin.me>
|
||||
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
---
|
||||
arch/mips/ar7/clock.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/arch/mips/ar7/clock.c
|
||||
+++ b/arch/mips/ar7/clock.c
|
||||
@@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable);
|
||||
|
||||
unsigned long clk_get_rate(struct clk *clk)
|
||||
{
|
||||
+ if (!clk)
|
||||
+ return 0;
|
||||
+
|
||||
return clk->rate;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_rate);
|
||||
Loading…
Reference in New Issue