kernel: update 4.1 to 4.1.5

[openwrt/svn-archive/archive.git] / target / linux / sunxi / patches-4.1 / 127-6-dt-sun7i-enable-nand-on-a20-pcduino3.patch

diff --git a/target/linux/sunxi/patches-4.1/127-6-dt-sun7i-enable-nand-on-a20-pcduino3.patch b/target/linux/sunxi/patches-4.1/127-6-dt-sun7i-enable-nand-on-a20-pcduino3.patch
index 25418b5db50efe5bae0052f0c3d6e22fa963c18b..81de87fd9e0086d8d2b847f50bb5e0a78eeef70a 100644 (file)
--- a/target/linux/sunxi/patches-4.1/127-6-dt-sun7i-enable-nand-on-a20-pcduino3.patch
+++ b/target/linux/sunxi/patches-4.1/127-6-dt-sun7i-enable-nand-on-a20-pcduino3.patch
@@ -1,10 +1,8 @@
-diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
-index b3c234c..fd1e921 100644
 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
-@@ -155,3 +155,62 @@
-               status = "okay";
-       };
+@@ -210,3 +210,62 @@
+               status = "okay";
+       };
  };
 +&nfc {
 +              pinctrl-names = "default";