diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-28 11:03:25 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-28 18:17:32 +0100 |
| commit | 3662157d8beda32d95fdc039da0b8114c0c2bb7b (patch) | |
| tree | 0ffeb568ffc471b47e3633e736e1e801676ef066 /target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch | |
| parent | 662b92614699164396aa38b18f4510333ba64f1d (diff) | |
| download | upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.gz upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.bz2 upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.zip | |
kernel: bump 4.14 to 4.14.96
Refreshed all patches.
Remove upstreamed patches:
- 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch b/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch index 5aadaa7b0b..0503b88823 100644 --- a/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch +++ b/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch @@ -15,8 +15,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt -index 62dd5baad70e..04fc368d828f 100644 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt @@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer @@ -32,11 +30,9 @@ index 62dd5baad70e..04fc368d828f 100644 - reg : Specifies base physical address and size of the registers. Example: -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 64e452a758fa..8401e7f887ff 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -665,5 +665,12 @@ +@@ -537,5 +537,12 @@ #address-cells = <1>; #size-cells = <0>; }; @@ -49,6 +45,3 @@ index 64e452a758fa..8401e7f887ff 100644 + }; }; }; --- -2.17.1 - |