git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
dts
/
meson.dtsi
diff --git
a/arch/arm/boot/dts/meson.dtsi
b/arch/arm/boot/dts/meson.dtsi
index
03bcff8
..
b67ede5
100644
(file)
--- a/
arch/arm/boot/dts/meson.dtsi
+++ b/
arch/arm/boot/dts/meson.dtsi
@@
-143,5
+143,12
@@
#size-cells = <0>;
status = "disabled";
};
+
+ ir_receiver: ir-receiver@c8100480 {
+ compatible= "amlogic,meson6-ir";
+ reg = <0xc8100480 0x20>;
+ interrupts = <0 15 1>;
+ status = "disabled";
+ };
};
}; /* end of / */