Davinci: allow SOCs based on other ARM CPUs

Preliminary modification prior to adding support for TNETV107X based on
ARM1176.  This change allows for CPUs other than ARM926T to be used for Davinci
derivative SoCs.  Existing devices (DA8x and DMx) operate unchanged.

Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 92622eb5cc0da6f651c31cdaf0ff55f8bba16977..1151d1afd756e5534f398256e3827e6c079b6ed6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -776,7 +776,6 @@ config ARCH_NOMADIK
 
 config ARCH_DAVINCI
        bool "TI DaVinci"
-       select CPU_ARM926T
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 0ebe185610bf80810f6cbfa5e0bf43466186a484..0316e201ada0e91ef064e157a206e6557351b3e7 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -7,6 +7,7 @@ config CP_INTC
        bool
 
 config ARCH_DAVINCI_DMx
+       select CPU_ARM926T
        bool
 
 menu "TI DaVinci Implementations"
@@ -41,6 +42,7 @@ config ARCH_DAVINCI_DA850
        select ARCH_HAS_CPUFREQ
 
 config ARCH_DAVINCI_DA8XX
+       select CPU_ARM926T
        bool
 
 config ARCH_DAVINCI_DM365