summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-11-24 00:12:08 +0100
committerHaojian Zhuang <haojian.zhuang@linaro.org>2013-01-23 17:05:08 +0800
commit495b21dc0e488b784ab1d4007d00db1ca2a95c98 (patch)
tree9db0e468861b022c8826cbedaab03b0cb8f405ee /arch/arm/mach-pxa
parent747f3449f311289b5d08e9337241c671214ae11a (diff)
downloadblackbird-op-linux-495b21dc0e488b784ab1d4007d00db1ca2a95c98.tar.gz
blackbird-op-linux-495b21dc0e488b784ab1d4007d00db1ca2a95c98.zip
ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock
Using pxa27x you could now build both RTC_DRV_PXA and RTC_DRV_SA1100. Make sure you don't use both together: link /dev/rtc0 or /dev/rtc1 to /dev/rtc according to your requirement. Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/pxa27x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 616cb87b6179..07f1bdb9cd8e 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = {
INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
+ INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
};
#ifdef CONFIG_PM
OpenPOWER on IntegriCloud