kernel: update 4.1 to 4.1.5

[openwrt.git] / target / linux / sunxi / patches-4.1 / 127-2-dt-sun7i-enable-nand-on-a20-olinuxino.patch

diff --git a/target/linux/sunxi/patches-4.1/127-2-dt-sun7i-enable-nand-on-a20-olinuxino.patch b/target/linux/sunxi/patches-4.1/127-2-dt-sun7i-enable-nand-on-a20-olinuxino.patch
index b632db1..a7dee13 100644 (file)
--- a/target/linux/sunxi/patches-4.1/127-2-dt-sun7i-enable-nand-on-a20-olinuxino.patch
+++ b/target/linux/sunxi/patches-4.1/127-2-dt-sun7i-enable-nand-on-a20-olinuxino.patch
@@ -1,10 +1,8 @@
-diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-index 39a51d5..f35957d 100644
 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-@@ -142,3 +142,60 @@
-               status = "okay";
-       };
+@@ -245,3 +245,60 @@
+               status = "okay";
+       };
  };
 +&nfc {
 +      pinctrl-names = "default";