projects
/
platform
/
kernel
/
linux-stable.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
[platform/kernel/linux-stable.git]
/
arch
/
arm
/
boot
/
dts
/
armada-370-xp.dtsi
diff --git
a/arch/arm/boot/dts/armada-370-xp.dtsi
b/arch/arm/boot/dts/armada-370-xp.dtsi
index
b6b2539
..
74b5964
100644
(file)
--- a/
arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/
arch/arm/boot/dts/armada-370-xp.dtsi
@@
-237,7
+237,7
@@
};
sata@a0000 {
- compatible = "marvell,
orion
-sata";
+ compatible = "marvell,
armada-370
-sata";
reg = <0xa0000 0x5000>;
interrupts = <55>;
clocks = <&gateclk 15>, <&gateclk 30>;