diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-19 16:04:10 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-19 16:04:10 -0500 |
| commit | 464d6e18639c4347dafd8dbcee270674dd3d8fba (patch) | |
| tree | d4c317831e7193ecb586734a962a618961b638f9 /arch/arm/boot/dts/at91sam9x5.dtsi | |
| parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
| parent | 16aa7f1f173f3ca105296cf2709cb039c99ffe4a (diff) | |
| download | linux-464d6e18639c4347dafd8dbcee270674dd3d8fba.tar.gz | |
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/at91sam9x5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index e1a5c70b885c..765a1e39858e 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -95,6 +95,8 @@ ramc0: ramc@ffffe800 { compatible = "atmel,at91sam9g45-ddramc"; reg = <0xffffe800 0x200>; + clocks = <&ddrck>; + clock-names = "ddrck"; }; pmc: pmc@fffffc00 { |