git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-38x.dtsi
diff --git
a/arch/arm/boot/dts/armada-38x.dtsi
b/arch/arm/boot/dts/armada-38x.dtsi
index 00ff549d4e391798ab119dc85b165db05d1b93d1..a6cc568f74f7ba2ba3e191f80b50a0980c087d01 100644
(file)
--- a/
arch/arm/boot/dts/armada-38x.dtsi
+++ b/
arch/arm/boot/dts/armada-38x.dtsi
@@
-279,6
+279,11
@@
marvell,function = "dev";
};
+ nand_rb: nand-rb {
+ marvell,pins = "mpp41";
+ marvell,function = "nand";
+ };
+
uart0_pins: uart-pins-0 {
marvell,pins = "mpp0", "mpp1";
marvell,function = "ua0";