Commit af63275b authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: spear: fix build error in restart.c

We can now enable mach-spear without selecting any of the
machines in a multiplatform configuration.
Doing so causes a build error that is trivial to fix by
making both the spear13xx and the spear3xx/6xx portion of
this file conditional rather than alternatives.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 5b65fc56
...@@ -26,7 +26,8 @@ void spear_restart(char mode, const char *cmd) ...@@ -26,7 +26,8 @@ void spear_restart(char mode, const char *cmd)
/* hardware reset, Use on-chip reset capability */ /* hardware reset, Use on-chip reset capability */
#ifdef CONFIG_ARCH_SPEAR13XX #ifdef CONFIG_ARCH_SPEAR13XX
writel_relaxed(0x01, SPEAR13XX_SYS_SW_RES); writel_relaxed(0x01, SPEAR13XX_SYS_SW_RES);
#else #endif
#if defined(CONFIG_ARCH_SPEAR3XX) || defined(CONFIG_ARCH_SPEAR6XX)
sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE); sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment