projects
/
kernel
/
kernel-generic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[kernel/kernel-generic.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
758c4ea
..
9693f79
100644
(file)
--- a/
arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/
arch/arm/boot/dts/armada-370-xp.dtsi
@@
-73,11
+73,6
@@
clocks = <&coreclk 2>;
};
- addr-decoding@d0020000 {
- compatible = "marvell,armada-addr-decoding-controller";
- reg = <0xd0020000 0x258>;
- };
-
sata@d00a0000 {
compatible = "marvell,orion-sata";
reg = <0xd00a0000 0x2400>;