mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
4f74957584
This adds the patches to get fairly complete Gemini support
using kernel v4.14. It is mainly a backport of patches from
kernel v4.16 with omissions of things like graphics that require
substantial changes and will be better handled once we move
to the v4.16 kernel proper.
On top of this are some WIP patches for USB support.
Tested on Raidsonic NAS4220B and D-link DNS-313.
ChangeLog v4->v5:
- Fix ethernet single gmac usecase
- Fix USB reset (patch from Hans)
- Fix Raidsonic ethernet skew delay
- Fix kernel config (bridge, squashfs, jffs2, usb)
- Disable second usb port on Raidsonic board until fotg210_hcd is fixed
ChangeLog v3->v4:
- Make sure to use tabs rather than spaces in base-files.
- Use the dns313 image tool from the firmware-utils.
- Break out the addition of the v4.14 patches and the removal
of the v4.4 patches to separate (big) patches.
ChangeLog v2->v3:
- Update the kernel config as indicated by Hauke Martens:
- Regenerate again after rebasing using kernel_oldconfig
dropping a few optimization settings that are now generic
- Drop CFG80211 stuff (module)
- Drop CIFS stuff (module)
- Drop MAC80211 (module)
- Drop wireless drivers (module)
- Enabled OverlayFS
- Added proper DNS-313 boot image generation with the special
file header tool.
- Disable CMA in the kernel
- Enable LZMA compression of the kernel
- Consequently name the nas4220b images nas4220b
- Update preinit MAC detection script to handle also DNS-313
- Add board.d/03_hdparm to set the disk to spin down after
1 minute by default, if we have the hdparm tool installed
ChangeLog v1->v2:
- Processed config through kernel_oldconfig
- Processed patches through make target/linux/{clean,refresh} V=99
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Roman Yeryomin <roman@advem.lv>
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 4347a0b0699989b889857c9d4ccfbce339859f13 Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Mon, 16 Oct 2017 22:54:25 +0200
|
|
Subject: [PATCH 19/31] watchdog: ftwdt010: Make interrupt optional
|
|
|
|
The Moxart does not appear to be using the interrupt from the
|
|
watchdog timer, maybe it's not even routed, so as to support
|
|
more architectures with this driver, make the interrupt
|
|
optional.
|
|
|
|
While we are at it: actually enable the use of the interrupt
|
|
if present by setting the right bit in the control register
|
|
and define the missing control register bits.
|
|
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
|
|
---
|
|
drivers/watchdog/ftwdt010_wdt.c | 30 ++++++++++++++++++------------
|
|
1 file changed, 18 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/watchdog/ftwdt010_wdt.c
|
|
+++ b/drivers/watchdog/ftwdt010_wdt.c
|
|
@@ -30,6 +30,8 @@
|
|
#define WDRESTART_MAGIC 0x5AB9
|
|
|
|
#define WDCR_CLOCK_5MHZ BIT(4)
|
|
+#define WDCR_WDEXT BIT(3)
|
|
+#define WDCR_WDINTR BIT(2)
|
|
#define WDCR_SYS_RST BIT(1)
|
|
#define WDCR_ENABLE BIT(0)
|
|
|
|
@@ -39,6 +41,7 @@ struct ftwdt010_wdt {
|
|
struct watchdog_device wdd;
|
|
struct device *dev;
|
|
void __iomem *base;
|
|
+ bool has_irq;
|
|
};
|
|
|
|
static inline
|
|
@@ -50,14 +53,17 @@ struct ftwdt010_wdt *to_ftwdt010_wdt(str
|
|
static int ftwdt010_wdt_start(struct watchdog_device *wdd)
|
|
{
|
|
struct ftwdt010_wdt *gwdt = to_ftwdt010_wdt(wdd);
|
|
+ u32 enable;
|
|
|
|
writel(wdd->timeout * WDT_CLOCK, gwdt->base + FTWDT010_WDLOAD);
|
|
writel(WDRESTART_MAGIC, gwdt->base + FTWDT010_WDRESTART);
|
|
/* set clock before enabling */
|
|
- writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST,
|
|
- gwdt->base + FTWDT010_WDCR);
|
|
- writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST | WDCR_ENABLE,
|
|
- gwdt->base + FTWDT010_WDCR);
|
|
+ enable = WDCR_CLOCK_5MHZ | WDCR_SYS_RST;
|
|
+ writel(enable, gwdt->base + FTWDT010_WDCR);
|
|
+ if (gwdt->has_irq)
|
|
+ enable |= WDCR_WDINTR;
|
|
+ enable |= WDCR_ENABLE;
|
|
+ writel(enable, gwdt->base + FTWDT010_WDCR);
|
|
|
|
return 0;
|
|
}
|
|
@@ -133,10 +139,6 @@ static int ftwdt010_wdt_probe(struct pla
|
|
if (IS_ERR(gwdt->base))
|
|
return PTR_ERR(gwdt->base);
|
|
|
|
- irq = platform_get_irq(pdev, 0);
|
|
- if (!irq)
|
|
- return -EINVAL;
|
|
-
|
|
gwdt->dev = dev;
|
|
gwdt->wdd.info = &ftwdt010_wdt_info;
|
|
gwdt->wdd.ops = &ftwdt010_wdt_ops;
|
|
@@ -158,10 +160,14 @@ static int ftwdt010_wdt_probe(struct pla
|
|
writel(reg, gwdt->base + FTWDT010_WDCR);
|
|
}
|
|
|
|
- ret = devm_request_irq(dev, irq, ftwdt010_wdt_interrupt, 0,
|
|
- "watchdog bark", gwdt);
|
|
- if (ret)
|
|
- return ret;
|
|
+ irq = platform_get_irq(pdev, 0);
|
|
+ if (irq) {
|
|
+ ret = devm_request_irq(dev, irq, ftwdt010_wdt_interrupt, 0,
|
|
+ "watchdog bark", gwdt);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ gwdt->has_irq = true;
|
|
+ }
|
|
|
|
ret = devm_watchdog_register_device(dev, &gwdt->wdd);
|
|
if (ret) {
|