kernel: update 4.1 to 4.1.5

[openwrt/openwrt.git] / target / linux / sunxi / patches-4.1 / 127-3-dt-sun4i-enable-nand-on-cubieboard.patch

diff --git a/target/linux/sunxi/patches-4.1/127-3-dt-sun4i-enable-nand-on-cubieboard.patch b/target/linux/sunxi/patches-4.1/127-3-dt-sun4i-enable-nand-on-cubieboard.patch
index 1f742a9de1dabbb8e76468fb8250fd97db2d9a2b..4075a9e262c9e71c6e76ffdeaf51c64d455c7653 100644 (file)
--- a/target/linux/sunxi/patches-4.1/127-3-dt-sun4i-enable-nand-on-cubieboard.patch
+++ b/target/linux/sunxi/patches-4.1/127-3-dt-sun4i-enable-nand-on-cubieboard.patch
@@ -11,13 +11,11 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 57 ++++++++++++++++++++++++++++++
  1 file changed, 57 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
-index 046a84d..a6faca3 100644
 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
-@@ -147,3 +147,60 @@
-       regulator-max-microvolt = <3000000>;
-       regulator-name = "avcc";
+@@ -215,3 +215,60 @@
+       regulator-max-microvolt = <3000000>;
+       regulator-name = "avcc";
  };
 +&nfc {
 +              pinctrl-names = "default";