From 322a7226d32222e19b2a633c05f56fa0f06da435 Mon Sep 17 00:00:00 2001
From: Stefan Koch <stefan.koch10@gmail.com>
Date: Wed, 22 Mar 2017 12:05:54 +0100
Subject: [PATCH] lantiq: vr9 fxs support: remove unused wdog declarations and
initializers
modify 0152-lantiq-VPE.patch from
commit e0229a16b000 ("lantiq: added support for VPE1")
- remove wdog function declarations from header (asm/vpe.h)
- remove wdog command line init functions (vpe.c)
Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
---
.../lantiq/patches-4.4/0152-lantiq-VPE.patch | 32 ++-----------------
.../lantiq/patches-4.9/0152-lantiq-VPE.patch | 32 ++-----------------
2 files changed, 4 insertions(+), 60 deletions(-)
diff --git a/target/linux/lantiq/patches-4.4/0152-lantiq-VPE.patch b/target/linux/lantiq/patches-4.4/0152-lantiq-VPE.patch
index bf883c8758..95a190c348 100644
--- a/target/linux/lantiq/patches-4.4/0152-lantiq-VPE.patch
+++ b/target/linux/lantiq/patches-4.4/0152-lantiq-VPE.patch
@@ -15,7 +15,7 @@
default "y"
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
-@@ -127,4 +127,23 @@ void cleanup_tc(struct tc *tc);
+@@ -127,4 +127,13 @@ void cleanup_tc(struct tc *tc);
int __init vpe_module_init(void);
void __exit vpe_module_exit(void);
@@ -27,16 +27,6 @@
+int32_t vpe1_sw_stop(uint32_t flags);
+uint32_t vpe1_get_load_addr(uint32_t flags);
+uint32_t vpe1_get_max_mem(uint32_t flags);
-+
-+/* Watchdog APIs */
-+extern uint32_t vpe1_wdog_ctr;
-+extern uint32_t vpe1_wdog_timeout;
-+
-+unsigned long vpe1_sw_wdog_start(unsigned long);
-+unsigned long vpe1_sw_wdog_stop(unsigned long);
-+
-+typedef int (*VPE_SW_WDOG_RESET)(unsigned long wdog_cleared_ok_count);
-+int32_t vpe1_sw_wdog_register_reset_handler(VPE_SW_WDOG_RESET reset_fn);
+
#endif /* _ASM_VPE_H */
--- a/arch/mips/kernel/vpe-mt.c
@@ -108,7 +98,7 @@
+#endif
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
-@@ -49,6 +49,59 @@ struct vpe_control vpecontrol = {
+@@ -49,6 +49,41 @@ struct vpe_control vpecontrol = {
.tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)
};
@@ -130,24 +120,6 @@
+}
+__setup("vpe1_mem=", vpe1mem);
+
-+uint32_t vpe1_wdog_ctr;
-+static int __init wdog_ctr(char *str)
-+{
-+ get_option(&str, &vpe1_wdog_ctr);
-+ return 1;
-+}
-+EXPORT_SYMBOL(vpe1_wdog_ctr);
-+__setup("vpe1_wdog_ctr_addr=", wdog_ctr);
-+
-+uint32_t vpe1_wdog_timeout;
-+static int __init wdog_timeout(char *str)
-+{
-+ get_option(&str, &vpe1_wdog_timeout);
-+ return 1;
-+}
-+EXPORT_SYMBOL(vpe1_wdog_timeout);
-+__setup("vpe1_wdog_timeout=", wdog_timeout);
-+
+uint32_t vpe1_get_load_addr(uint32_t flags)
+{
+ return vpe1_load_addr;
diff --git a/target/linux/lantiq/patches-4.9/0152-lantiq-VPE.patch b/target/linux/lantiq/patches-4.9/0152-lantiq-VPE.patch
index 3fca7dc258..2b6a2575f8 100644
--- a/target/linux/lantiq/patches-4.9/0152-lantiq-VPE.patch
+++ b/target/linux/lantiq/patches-4.9/0152-lantiq-VPE.patch
@@ -15,7 +15,7 @@
default "y"
--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
-@@ -127,4 +127,23 @@ void cleanup_tc(struct tc *tc);
+@@ -127,4 +127,13 @@ void cleanup_tc(struct tc *tc);
int __init vpe_module_init(void);
void __exit vpe_module_exit(void);
@@ -27,16 +27,6 @@
+int32_t vpe1_sw_stop(uint32_t flags);
+uint32_t vpe1_get_load_addr(uint32_t flags);
+uint32_t vpe1_get_max_mem(uint32_t flags);
-+
-+/* Watchdog APIs */
-+extern uint32_t vpe1_wdog_ctr;
-+extern uint32_t vpe1_wdog_timeout;
-+
-+unsigned long vpe1_sw_wdog_start(unsigned long);
-+unsigned long vpe1_sw_wdog_stop(unsigned long);
-+
-+typedef int (*VPE_SW_WDOG_RESET)(unsigned long wdog_cleared_ok_count);
-+int32_t vpe1_sw_wdog_register_reset_handler(VPE_SW_WDOG_RESET reset_fn);
+
#endif /* _ASM_VPE_H */
--- a/arch/mips/kernel/vpe-mt.c
@@ -108,7 +98,7 @@
+#endif
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
-@@ -49,6 +49,59 @@ struct vpe_control vpecontrol = {
+@@ -49,6 +49,41 @@ struct vpe_control vpecontrol = {
.tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)
};
@@ -130,24 +120,6 @@
+}
+__setup("vpe1_mem=", vpe1mem);
+
-+uint32_t vpe1_wdog_ctr;
-+static int __init wdog_ctr(char *str)
-+{
-+ get_option(&str, &vpe1_wdog_ctr);
-+ return 1;
-+}
-+EXPORT_SYMBOL(vpe1_wdog_ctr);
-+__setup("vpe1_wdog_ctr_addr=", wdog_ctr);
-+
-+uint32_t vpe1_wdog_timeout;
-+static int __init wdog_timeout(char *str)
-+{
-+ get_option(&str, &vpe1_wdog_timeout);
-+ return 1;
-+}
-+EXPORT_SYMBOL(vpe1_wdog_timeout);
-+__setup("vpe1_wdog_timeout=", wdog_timeout);
-+
+uint32_t vpe1_get_load_addr(uint32_t flags)
+{
+ return vpe1_load_addr;
--
GitLab