From e5441232a81d01e2ed46d88e340a30fd6b15b012 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 10 Sep 2014 21:40:19 +0000 Subject: kernel: update 3.14 to 3.14.18 Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch') diff --git a/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch b/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch index 417dddc2c0..44e9f53cbc 100644 --- a/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch +++ b/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch @@ -9,8 +9,6 @@ Signed-off-by: Hans de Goede arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++ 2 files changed, 16 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts -index 822cbe2..15f1f3f 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -14,6 +14,7 @@ @@ -21,7 +19,7 @@ index 822cbe2..15f1f3f 100644 / { model = "Olimex A20-Olinuxino Micro"; -@@ -96,6 +97,14 @@ +@@ -73,6 +74,14 @@ }; }; @@ -36,11 +34,9 @@ index 822cbe2..15f1f3f 100644 uart0: serial@01c28000 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 1d9b314..0c57ac5 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi -@@ -735,6 +735,13 @@ +@@ -670,6 +670,13 @@ interrupts = <0 24 4>; }; @@ -54,6 +50,3 @@ index 1d9b314..0c57ac5 100644 sid: eeprom@01c23800 { compatible = "allwinner,sun7i-a20-sid"; reg = <0x01c23800 0x200>; --- -2.0.3 - -- cgit v1.2.3