ARM: DRA7XX: Add support for DRA7XX only build

SOC_DRA7XX was under wrong menu within Kconfig file, which prevented
DRA7XX only build. Fixed the kconfig options for this SoC as we are
there. voltage.c needs to be added to the DRA7XX build also, otherwise
DRA7XX only build will fail.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index dc21df16616119f8341077fd5131537065590088..e65948a9aa0e34fc1ad58b596477a8f28e5d6465 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -76,6 +76,16 @@ config SOC_AM43XX
        select ARM_GIC
        select MACH_OMAP_GENERIC
 
+config SOC_DRA7XX
+       bool "TI DRA7XX"
+       depends on ARCH_MULTI_V7
+       select ARCH_OMAP2PLUS
+       select ARM_CPU_SUSPEND if PM
+       select ARM_GIC
+       select CPU_V7
+       select HAVE_SMP
+       select HAVE_ARM_ARCH_TIMER
+
 config ARCH_OMAP2PLUS
        bool
        select ARCH_HAS_BANDGAP
@@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER
        depends on SOC_OMAP5 || SOC_DRA7XX
        default y
 
-config SOC_DRA7XX
-       bool "TI DRA7XX"
-       select ARM_ARCH_TIMER
-       select CPU_V7
-       select ARM_GIC
-       select HAVE_SMP
-       select COMMON_CLK
-
 comment "OMAP Core Type"
        depends on ARCH_OMAP2
 

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8ad6fb0d4ac9bc168be0bab00def99171d9c01d0..3d9c121305f49e086360bef2a42db3ab974a8704 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -132,6 +132,7 @@ obj-$(CONFIG_SOC_AM33XX)            += $(voltagedomain-common)
 obj-$(CONFIG_SOC_AM43XX)               += $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)                        += $(voltagedomain-common)
 obj-$(CONFIG_SOC_OMAP5)                += voltagedomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)               += $(voltagedomain-common)
 
 # OMAP powerdomain framework
 powerdomain-common                     += powerdomain.o powerdomain-common.o