summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPratyush Anand <pratyush.anand@st.com>2014-02-11 07:40:47 +0100
committerViresh Kumar <viresh.kumar@linaro.org>2014-07-14 07:34:42 +0200
commit23b7ad23cb95db188403677c51c997338fb9effd (patch)
treeea145481d44f2d9df2100ed11aae7ee6cc5f278a /arch/arm
parentARM: SPEAr13xx: Fix static mapping table (diff)
downloadlinux-23b7ad23cb95db188403677c51c997338fb9effd.tar.xz
linux-23b7ad23cb95db188403677c51c997338fb9effd.zip
ARM: SPEAr13xx: Add bindings and dt node for misc block
SPEAr SOCs have some miscellaneous registers which are used to configure peripheral. This patch adds dt node and binding information for this block. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Pratyush Anand <pratyush.anand@st.com> Cc: devicetree@vger.kernel.org [viresh: fixed logs/cclist] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/spear13xx.dtsi5
-rw-r--r--arch/arm/mach-spear/Kconfig1
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 4382547df58a..3a72508c578f 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -220,6 +220,11 @@
0xd8000000 0xd8000000 0x01000000
0xe0000000 0xe0000000 0x10000000>;
+ misc: syscon@e0700000 {
+ compatible = "st,spear1340-misc", "syscon";
+ reg = <0xe0700000 0x1000>;
+ };
+
gpio0: gpio@e0600000 {
compatible = "arm,pl061", "arm,primecell";
reg = <0xe0600000 0x1000>;
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 90df2022276a..ba57677cee28 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -19,6 +19,7 @@ config ARCH_SPEAR13XX
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select PINCTRL
+ select MFD_SYSCON
help
Supports for ARM's SPEAR13XX family