projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade 3.13 targets to 3.13.2, refresh patches
[openwrt/openwrt.git]
/
target
/
linux
/
sunxi
/
patches-3.13
/
194-dt-sun7i-add-gmac-ctrler.patch
diff --git
a/target/linux/sunxi/patches-3.13/194-dt-sun7i-add-gmac-ctrler.patch
b/target/linux/sunxi/patches-3.13/194-dt-sun7i-add-gmac-ctrler.patch
index 894378b81514d459ead110ceb1dd5d52d0cbee12..0b65dac0e4d55525160b5269873a4bf898872489 100644
(file)
--- a/
target/linux/sunxi/patches-3.13/194-dt-sun7i-add-gmac-ctrler.patch
+++ b/
target/linux/sunxi/patches-3.13/194-dt-sun7i-add-gmac-ctrler.patch
@@
-8,11
+8,9
@@
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 0c1d363..82be552 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
-@@ -
571,6 +571
,20 @@
+@@ -
605,6 +605
,20 @@
status = "disabled";
};
status = "disabled";
};
@@
-33,6
+31,3
@@
index 0c1d363..82be552 100644
hstimer@01c60000 {
compatible = "allwinner,sun7i-a20-hstimer";
reg = <0x01c60000 0x1000>;
hstimer@01c60000 {
compatible = "allwinner,sun7i-a20-hstimer";
reg = <0x01c60000 0x1000>;
---
-1.8.5.1
-