projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.18
[openwrt/staging/stintel.git]
/
target
/
linux
/
sunxi
/
patches-3.14
/
156-dt-sunxi-update-wdt-compats.patch
diff --git
a/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
b/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
index 6ac1a7e8f9771ea1e3e27db4fc29d7738c163e33..235550b47d3d159b7a1f39e78ddcec451d0c2f26 100644
(file)
--- a/
target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
+++ b/
target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
@@
-16,11
+16,9
@@
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 3ce650b..4b90a18 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
-@@ -
597,7 +59
7,7 @@
+@@ -
487,7 +48
7,7 @@
};
wdt: watchdog@01c20c90 {
};
wdt: watchdog@01c20c90 {
@@
-29,11
+27,9
@@
index 3ce650b..4b90a18 100644
reg = <0x01c20c90 0x10>;
};
reg = <0x01c20c90 0x10>;
};
-diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
-index 1795c26..45300a6 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
-@@ -
508,7 +508
,7 @@
+@@ -
392,7 +392
,7 @@
};
wdt: watchdog@01c20c90 {
};
wdt: watchdog@01c20c90 {
@@
-42,11
+38,9
@@
index 1795c26..45300a6 100644
reg = <0x01c20c90 0x10>;
};
reg = <0x01c20c90 0x10>;
};
-diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
-index 8bc8e14..280ffee 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
-@@ -
454,7 +454
,7 @@
+@@ -
393,7 +393
,7 @@
};
wdt: watchdog@01c20c90 {
};
wdt: watchdog@01c20c90 {
@@
-55,8
+49,6
@@
index 8bc8e14..280ffee 100644
reg = <0x01c20c90 0x10>;
};
reg = <0x01c20c90 0x10>;
};
-diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
-index e4267bd..8441733 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -289,7 +289,7 @@
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -289,7 +289,7 @@
@@
-68,11
+60,9
@@
index e4267bd..8441733 100644
reg = <0x01c20ca0 0x20>;
};
reg = <0x01c20ca0 0x20>;
};
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 30b9aba..4981f5e 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -
725,7 +725
,7 @@
+@@ -
608,7 +608
,7 @@
};
wdt: watchdog@01c20c90 {
};
wdt: watchdog@01c20c90 {
@@
-81,6
+71,3
@@
index 30b9aba..4981f5e 100644
reg = <0x01c20c90 0x10>;
};
reg = <0x01c20c90 0x10>;
};
---
-2.0.3
-