projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
armada-375.dtsi
diff --git
a/arch/arm/boot/dts/armada-375.dtsi
b/arch/arm/boot/dts/armada-375.dtsi
index
f076ff8
..
67a0ab0
100644
(file)
--- a/
arch/arm/boot/dts/armada-375.dtsi
+++ b/
arch/arm/boot/dts/armada-375.dtsi
@@
-238,7
+238,8
@@
};
spi0: spi@10600 {
};
spi0: spi@10600 {
- compatible = "marvell,orion-spi";
+ compatible = "marvell,armada-375-spi",
+ "marvell,orion-spi";
reg = <0x10600 0x50>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x10600 0x50>;
#address-cells = <1>;
#size-cells = <0>;
@@
-249,7
+250,8
@@
};
spi1: spi@10680 {
};
spi1: spi@10680 {
- compatible = "marvell,orion-spi";
+ compatible = "marvell,armada-375-spi",
+ "marvell,orion-spi";
reg = <0x10680 0x50>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x10680 0x50>;
#address-cells = <1>;
#size-cells = <0>;