aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch)
treeb35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
parenta899dbd4e32835b0a1d917479d10e5a2744c273c (diff)
downloadupstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz
upstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2
upstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch')
-rw-r--r--target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch b/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
index 4a544cd695..f5763badd5 100644
--- a/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
+++ b/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
@@ -11,12 +11,10 @@ Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
arch/arm/boot/dts/sun7i-a20.dtsi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 4e4d6ce..3050369 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -784,6 +784,24 @@
- #pwm-cells = <3>;
+@@ -785,6 +785,24 @@
+ interrupts = <0 24 4>;
};
+ ir0: ir@01c21800 {