diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 19:02:44 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 19:02:44 +0300 |
commit | e897ee70dcf9ee50d801a495f4d66a404d37376e (patch) | |
tree | d0027070c0426345b3d2f1f8e1b9bd0f0deb4391 /arch/arm | |
parent | 810265812aca72a034111c3ada73cc1caa0d6990 (diff) | |
parent | 724814b4fada4a353728c3caa8ad2809c64893b6 (diff) | |
download | linux-e897ee70dcf9ee50d801a495f4d66a404d37376e.tar.xz |
Merge tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
Merge "Device Tree changes for Ux500 and ARM SOC" from Linus Walleij:
- Document Snoop Control Unit (SCU) bindings
- Document Ux500 board bindings
- Define the backup RAM in the DBx500 device tree
* tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: define the backupram in the device tree
ARM: ux500: add board documentation
ARM: scu: document Snoop Control Unit DT bindings
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/ste-dbx5x0.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index f024a1c0de8b..853684ad7773 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -190,6 +190,15 @@ reg = <0xa0410000 0x100>; }; + /* + * The backup RAM is used for retention during sleep + * and various things like spin tables + */ + backupram@80150000 { + compatible = "ste,dbx500-backupram"; + reg = <0x80150000 0x2000>; + }; + L2: l2-cache { compatible = "arm,pl310-cache"; reg = <0xa0412000 0x1000>; |