projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.1 to 4.1.5
[openwrt.git]
/
target
/
linux
/
sunxi
/
patches-4.1
/
127-4-dt-sun4i-enable-nand-on-a10-lime.patch
diff --git
a/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch
b/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch
index
b948c20
..
2464408
100644
(file)
--- a/
target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch
+++ b/
target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch
@@
-1,10
+1,8
@@
-diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
-index b3c234c..fd1e921 100644
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
-@@ -1
55,3 +155
,62 @@
- status = "okay";
- };
+@@ -1
89,3 +189
,62 @@
+ status = "okay";
+ };
};
+&nfc {
+ pinctrl-names = "default";
};
+&nfc {
+ pinctrl-names = "default";