projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20-olinuxino-micro.dts
diff --git
a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index d0dcf72609717c8cdc52b1914d58d56784ef628d..714e15ac5416b71f2b56b60646092eeb24d3d0d2 100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@
-25,6
+25,9
@@
compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
aliases {
+ serial0 = &uart0;
+ serial1 = &uart6;
+ serial2 = &uart7;
spi0 = &spi1;
spi1 = &spi2;
};