projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dt
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-i12-tvbox.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index
cba1567
..
6a67712
100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@
-94,6
+94,12
@@
};
};
+ ir0: ir@01c21800 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ir0_pins_a>;
+ status = "okay";
+ };
+
uart0: serial@01c28000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;