summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sama5d3.dtsi
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2014-08-20 01:04:10 +0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-08-20 01:04:10 +0400
commit464d6e18639c4347dafd8dbcee270674dd3d8fba (patch)
treed4c317831e7193ecb586734a962a618961b638f9 /arch/arm/boot/dts/sama5d3.dtsi
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
parent16aa7f1f173f3ca105296cf2709cb039c99ffe4a (diff)
downloadlinux-464d6e18639c4347dafd8dbcee270674dd3d8fba.tar.xz
Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux
Pull AT91 ramc and reset/poweroff related DT patches from Maxim Ripard: "This branch gathers a few devicetree patches needed for the reworks found in the later patches to be sent. More precisely, it holds: - The addition of ddrck for the sama5d3 and the sam9 SoCs - The addition of the shutdown controller node in the sama5d3 DTSI - The slight rework of the ramc bindings for the SoCs that have several RAM controllers" Conflicts: arch/arm/boot/dts/at91sam9g45.dtsi
Diffstat (limited to 'arch/arm/boot/dts/sama5d3.dtsi')
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 45013b867c8d..7702a0d120cb 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -402,8 +402,10 @@
};
ramc0: ramc@ffffea00 {
- compatible = "atmel,at91sam9g45-ddramc";
+ compatible = "atmel,sama5d3-ddramc";
reg = <0xffffea00 0x200>;
+ clocks = <&ddrck>, <&mpddr_clk>;
+ clock-names = "ddrck", "mpddr";
};
dbgu: serial@ffffee00 {
@@ -1170,6 +1172,11 @@
#clock-cells = <0>;
reg = <48>;
};
+
+ mpddr_clk: mpddr_clk {
+ #clock-cells = <0>;
+ reg = <49>;
+ };
};
};
@@ -1178,6 +1185,11 @@
reg = <0xfffffe00 0x10>;
};
+ shutdown-controller@fffffe10 {
+ compatible = "atmel,at91sam9x5-shdwc";
+ reg = <0xfffffe10 0x10>;
+ };
+
pit: timer@fffffe30 {
compatible = "atmel,at91sam9260-pit";
reg = <0xfffffe30 0xf>;