projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp.dtsi
diff --git
a/arch/arm/boot/dts/armada-xp.dtsi
b/arch/arm/boot/dts/armada-xp.dtsi
index 0854d4493da7a8518c241dabe06e91ce22eb5fe9..3de9b761cc1ab0fe7a8d3f0ea9caa7ca72e2a989 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp.dtsi
+++ b/
arch/arm/boot/dts/armada-xp.dtsi
@@
-305,7
+305,7
@@
spi0_pins: spi0-pins {
marvell,pins = "mpp36", "mpp37",
"mpp38", "mpp39";
- marvell,function = "spi";
+ marvell,function = "spi
0
";
};
uart2_pins: uart2-pins {