From 098f187e7870684bfaaa53a1fdfc9682cc1e0dae Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 14 Aug 2015 13:06:33 +0000 Subject: kernel: update 4.1 to 4.1.5 Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-4.1/127-3-dt-sun4i-enable-nand-on-cubieboard.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '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 1f742a9de1..4075a9e262 100644 --- 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 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"; -- cgit v1.2.3