summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-06-13 21:42:22 -0500
committerJohn Rigby <john.rigby@linaro.org>2012-08-15 23:46:25 -0600
commit19fe2dcc129c23dc592e219283c63d54ce9e5489 (patch)
tree8ca6a920d0e75c9cf5b018f4621b1406e436da87
parent89d5215b713d070470ffdd5d1f4f1f6c7c923360 (diff)
downloadlinux-topics-19fe2dcc129c23dc592e219283c63d54ce9e5489.tar.gz
UBUNTU: SAUCE: ARM smp_twd: add back "arm,smp-twd" compatible property
BugLink: http://launchpad.net/bugs/1008345 The compatible property changed but this will break platforms if they have a dtb with the old name. This will not be needed once all systems have an updated dtb. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r--arch/arm/kernel/smp_twd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index fef42b21cec..ff237227aef 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -313,6 +313,7 @@ const static struct of_device_id twd_of_match[] __initconst = {
{ .compatible = "arm,cortex-a9-twd-timer", },
{ .compatible = "arm,cortex-a5-twd-timer", },
{ .compatible = "arm,arm11mp-twd-timer", },
+ { .compatible = "arm,smp-twd", },
{ },
};