Already applied in upstream.
Signed-off-by: Zhao, Gang <gang.zhao...@gmail.com>
---
...S-ath79-don-t-hardwire-cpu_has_dsp-2-to-0.patch | 31 ----------
...simplify-platform_get_resource_byname-dev.patch | 70 ---------------------
...r933x_uart-convert-to-use-devm_-functions.patch | 72 ----------------------
...h79-wdt-avoid-spurious-restarts-on-AR934x.patch | 48 ---------------
4 files changed, 221 deletions(-)
delete mode 100644
target/linux/ar71xx/patches-3.14/100-MIPS-ath79-don-t-hardwire-cpu_has_dsp-2-to-0.patch
delete mode 100644
target/linux/ar71xx/patches-3.14/101-MIPS-ath79-simplify-platform_get_resource_byname-dev.patch
delete mode 100644
target/linux/ar71xx/patches-3.14/103-tty-ar933x_uart-convert-to-use-devm_-functions.patch
delete mode 100644
target/linux/ar71xx/patches-3.14/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch
diff --git
a/target/linux/ar71xx/patches-3.14/100-MIPS-ath79-don-t-hardwire-cpu_has_dsp-2-to-0.patch
b/target/linux/ar71xx/patches-3.14/100-MIPS-ath79-don-t-hardwire-cpu_has_dsp-2-to-0.patch
deleted file mode 100644
index ecced79..0000000
---
a/target/linux/ar71xx/patches-3.14/100-MIPS-ath79-don-t-hardwire-cpu_has_dsp-2-to-0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c9da75bfa6cd7a47f5b2a1d183d34c165a06dd1a Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juh...@openwrt.org>
-Date: Thu, 22 Aug 2013 11:15:18 +0200
-Subject: [PATCH] MIPS: ath79: don't hardwire cpu_has_dsp{2} to 0
-
-The ath79 code supports various SoCs which are using either a 24Kc
-or a 74Kc core. The 74Kc core has DSP support, so don't hardwire
-the values to zero.
-
-Commit 00dc5ce2a653a332190aa29b2e1f3bceaa7d5b8d (MIPS: ath79: don't
-hardcode the unavailability of the DSP ASE) has fixed this already,
-but that change got reverted by 475032564ed96c94c085e3e7a90e07d150a7cec9
-(MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.)
-
-Reported-by: Helmut Schaa <helmut.sc...@googlemail.com>
-Signed-off-by: Gabor Juhos <juh...@openwrt.org>
----
- arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
-+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
-@@ -42,8 +42,6 @@
- #define cpu_has_mips64r1 0
- #define cpu_has_mips64r2 0
-
--#define cpu_has_dsp 0
--#define cpu_has_dsp2 0
- #define cpu_has_mipsmt 0
-
- #define cpu_has_64bits 0
diff --git
a/target/linux/ar71xx/patches-3.14/101-MIPS-ath79-simplify-platform_get_resource_byname-dev.patch
b/target/linux/ar71xx/patches-3.14/101-MIPS-ath79-simplify-platform_get_resource_byname-dev.patch
deleted file mode 100644
index 04e2a25..0000000
---
a/target/linux/ar71xx/patches-3.14/101-MIPS-ath79-simplify-platform_get_resource_byname-dev.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 59a93f8909b8ab5d61e024e8b3771fdf94a774f0 Mon Sep 17 00:00:00 2001
-From: Julia Lawall <julia.law...@lip6.fr>
-Date: Mon, 19 Aug 2013 10:51:56 +0200
-Subject: [PATCH] MIPS: ath79: simplify
platform_get_resource_byname/devm_ioremap_resource
-
-Remove unneeded error handling on the result of a call to
-platform_get_resource_byname when the value is passed to devm_ioremap_resource.
-
-A simplified version of the semantic patch that makes this change is as
-follows: (http://coccinelle.lip6.fr/)
-
-// <smpl>
-@@
-expression pdev,res,e,e1;
-expression ret != 0;
-identifier l;
-@@
-
- res = platform_get_resource_byname(...);
-- if (res == NULL) { ... \(goto l;\|return ret;\) }
- e = devm_ioremap_resource(e1, res);
-// </smpl>
-
-Signed-off-by: Julia Lawall <julia.law...@lip6.fr>
-Acked-by: Gabor Juhos <juh...@openwrt.org>
----
- arch/mips/pci/pci-ar71xx.c | 3 ---
- arch/mips/pci/pci-ar724x.c | 9 ---------
- 2 files changed, 12 deletions(-)
-
---- a/arch/mips/pci/pci-ar71xx.c
-+++ b/arch/mips/pci/pci-ar71xx.c
-@@ -363,9 +363,6 @@ static int ar71xx_pci_probe(struct platf
- spin_lock_init(&apc->lock);
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
-- if (!res)
-- return -EINVAL;
--
- apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(apc->cfg_base))
- return PTR_ERR(apc->cfg_base);
---- a/arch/mips/pci/pci-ar724x.c
-+++ b/arch/mips/pci/pci-ar724x.c
-@@ -362,25 +362,16 @@ static int ar724x_pci_probe(struct platf
- return -ENOMEM;
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl_base");
-- if (!res)
-- return -EINVAL;
--
- apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(apc->ctrl_base))
- return PTR_ERR(apc->ctrl_base);
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
-- if (!res)
-- return -EINVAL;
--
- apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(apc->devcfg_base))
- return PTR_ERR(apc->devcfg_base);
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base");
-- if (!res)
-- return -EINVAL;
--
- apc->crp_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(apc->crp_base))
- return PTR_ERR(apc->crp_base);
diff --git
a/target/linux/ar71xx/patches-3.14/103-tty-ar933x_uart-convert-to-use-devm_-functions.patch
b/target/linux/ar71xx/patches-3.14/103-tty-ar933x_uart-convert-to-use-devm_-functions.patch
deleted file mode 100644
index fab6f23..0000000
---
a/target/linux/ar71xx/patches-3.14/103-tty-ar933x_uart-convert-to-use-devm_-functions.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f157945cd134e2cfa47ed9bb1f599632d112d94e Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juh...@openwrt.org>
-Date: Mon, 29 Jul 2013 19:39:20 +0200
-Subject: [PATCH] tty: ar933x_uart: convert to use devm_* functions
-
-Use devm_* functions in order to simplify cleanup
-paths.
-
-Signed-off-by: Gabor Juhos <juh...@openwrt.org>
----
- drivers/tty/serial/ar933x_uart.c | 26 ++++++++------------------
- 1 file changed, 8 insertions(+), 18 deletions(-)
-
---- a/drivers/tty/serial/ar933x_uart.c
-+++ b/drivers/tty/serial/ar933x_uart.c
-@@ -652,19 +652,18 @@ static int ar933x_uart_probe(struct plat
- return -EINVAL;
- }
-
-- up = kzalloc(sizeof(struct ar933x_uart_port), GFP_KERNEL);
-+ up = devm_kzalloc(&pdev->dev, sizeof(struct ar933x_uart_port),
-+ GFP_KERNEL);
- if (!up)
- return -ENOMEM;
-
- port = &up->port;
-- port->mapbase = mem_res->start;
-
-- port->membase = ioremap(mem_res->start, AR933X_UART_REGS_SIZE);
-- if (!port->membase) {
-- ret = -ENOMEM;
-- goto err_free_up;
-- }
-+ port->membase = devm_ioremap_resource(&pdev->dev, mem_res);
-+ if (IS_ERR(port->membase))
-+ return PTR_ERR(port->membase);
-
-+ port->mapbase = mem_res->start;
- port->line = id;
- port->irq = irq_res->start;
- port->dev = &pdev->dev;
-@@ -686,16 +685,10 @@ static int ar933x_uart_probe(struct plat
-
- ret = uart_add_one_port(&ar933x_uart_driver, &up->port);
- if (ret)
-- goto err_unmap;
-+ return ret;
-
- platform_set_drvdata(pdev, up);
- return 0;
--
--err_unmap:
-- iounmap(up->port.membase);
--err_free_up:
-- kfree(up);
-- return ret;
- }
-
- static int ar933x_uart_remove(struct platform_device *pdev)
-@@ -705,11 +698,8 @@ static int ar933x_uart_remove(struct pla
- up = platform_get_drvdata(pdev);
- platform_set_drvdata(pdev, NULL);
-
-- if (up) {
-+ if (up)
- uart_remove_one_port(&ar933x_uart_driver, &up->port);
-- iounmap(up->port.membase);
-- kfree(up);
-- }
-
- return 0;
- }
diff --git
a/target/linux/ar71xx/patches-3.14/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch
b/target/linux/ar71xx/patches-3.14/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch
deleted file mode 100644
index c7bf066..0000000
---
a/target/linux/ar71xx/patches-3.14/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2ff030d44672d745c5327b72463af43f5103e99b Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juh...@openwrt.org>
-Date: Tue, 25 Mar 2014 17:07:46 +0100
-Subject: [PATCH] watchdog: ath79-wdt: avoid spurious restarts on AR934x
-
-On some AR934x based systems, where the frequency of
-the AHB bus is relatively high, the built-in watchdog
-causes a spurious restart when it gets enabled.
-
-The possible cause of these restarts is that the timeout
-value written into the TIMER register does not reaches
-the hardware in time.
-
-Add an explicit delay into the ath79_wdt_enable function
-to avoid the spurious restarts.
-
-Signed-off-by: Gabor Juhos <juh...@openwrt.org>
-Cc: <sta...@vger.kernel.org>
----
- drivers/watchdog/ath79_wdt.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/watchdog/ath79_wdt.c
-+++ b/drivers/watchdog/ath79_wdt.c
-@@ -20,6 +20,7 @@
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/bitops.h>
-+#include <linux/delay.h>
- #include <linux/errno.h>
- #include <linux/fs.h>
- #include <linux/init.h>
-@@ -91,6 +92,15 @@ static inline void ath79_wdt_keepalive(v
- static inline void ath79_wdt_enable(void)
- {
- ath79_wdt_keepalive();
-+
-+ /*
-+ * Updating the TIMER register requires a few microseconds
-+ * on the AR934x SoCs at least. Use a small delay to ensure
-+ * that the TIMER register is updated within the hardware
-+ * before enabling the watchdog.
-+ */
-+ udelay(2);
-+
- ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR);
- /* flush write */
- ath79_wdt_rr(WDOG_REG_CTRL);
--
1.9.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
