aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2010-04-30 21:31:36 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-01 11:32:59 +0100
commite5992c05ffaa405cd291aa9fbca042ad47d53632 (patch)
treeb02d7b8602073c246487c16937ac92d781b0af98
parentd2ae1587b8283e58e18b31f7764592f462edaf31 (diff)
downloadkernel_goldelico_gta04-e5992c05ffaa405cd291aa9fbca042ad47d53632.zip
kernel_goldelico_gta04-e5992c05ffaa405cd291aa9fbca042ad47d53632.tar.gz
kernel_goldelico_gta04-e5992c05ffaa405cd291aa9fbca042ad47d53632.tar.bz2
ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver
Just to make sure that this driver won't run on StrongArm SA1100 when both SA1100 and SA1110 cpufreq drivers are built in (usually in multimachine config). SA1100 driver already has similar check. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Acked-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/cpu-sa1110.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 63b32b6..7252874 100644
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -363,6 +363,9 @@ static int __init sa1110_clk_init(void)
struct sdram_params *sdram;
const char *name = sdram_name;
+ if (!cpu_is_sa1110())
+ return -ENODEV;
+
if (!name[0]) {
if (machine_is_assabet())
name = "TC59SM716-CL3";