Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers
* 'rtc-sa1100' of git://github.com/hzhuang1/linux: ARM: mmp: enable rtc in pxa910 rtc: sa1100: enable clk support ARM: pxa: add rtc dummy clock ARM: sa1100: clean up clock support rtc: sa1100: declare irq in resource rtc: sa1100: remove verification code of alarm rtc: sa1100: remove periodic code
This commit is contained in:
commit
7169ff4a09
|
@ -754,7 +754,7 @@ config ARCH_SA1100
|
|||
select ARCH_HAS_CPUFREQ
|
||||
select CPU_FREQ
|
||||
select GENERIC_CLOCKEVENTS
|
||||
select HAVE_CLK
|
||||
select CLKDEV_LOOKUP
|
||||
select HAVE_SCHED_CLOCK
|
||||
select TICK_ONESHOT
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
|
|
|
@ -22,6 +22,7 @@ extern struct pxa_device_desc pxa910_device_pwm4;
|
|||
extern struct pxa_device_desc pxa910_device_nand;
|
||||
|
||||
extern struct platform_device pxa910_device_gpio;
|
||||
extern struct platform_device pxa910_device_rtc;
|
||||
|
||||
static inline int pxa910_add_uart(int id)
|
||||
{
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
#define APBC_PXA910_SSP1 APBC_REG(0x01c)
|
||||
#define APBC_PXA910_SSP2 APBC_REG(0x020)
|
||||
#define APBC_PXA910_IPC APBC_REG(0x024)
|
||||
#define APBC_PXA910_RTC APBC_REG(0x028)
|
||||
#define APBC_PXA910_TWSI0 APBC_REG(0x02c)
|
||||
#define APBC_PXA910_KPC APBC_REG(0x030)
|
||||
#define APBC_PXA910_TIMERS APBC_REG(0x034)
|
||||
|
|
23
arch/arm/mach-mmp/include/mach/regs-rtc.h
Normal file
23
arch/arm/mach-mmp/include/mach/regs-rtc.h
Normal file
|
@ -0,0 +1,23 @@
|
|||
#ifndef __ASM_MACH_REGS_RTC_H
|
||||
#define __ASM_MACH_REGS_RTC_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
|
||||
#define RTC_VIRT_BASE (APB_VIRT_BASE + 0x10000)
|
||||
#define RTC_REG(x) (*((volatile u32 __iomem *)(RTC_VIRT_BASE + (x))))
|
||||
|
||||
/*
|
||||
* Real Time Clock
|
||||
*/
|
||||
|
||||
#define RCNR RTC_REG(0x00) /* RTC Count Register */
|
||||
#define RTAR RTC_REG(0x04) /* RTC Alarm Register */
|
||||
#define RTSR RTC_REG(0x08) /* RTC Status Register */
|
||||
#define RTTR RTC_REG(0x0C) /* RTC Timer Trim Register */
|
||||
|
||||
#define RTSR_HZE (1 << 3) /* HZ interrupt enable */
|
||||
#define RTSR_ALE (1 << 2) /* RTC alarm interrupt enable */
|
||||
#define RTSR_HZ (1 << 1) /* HZ rising-edge detected */
|
||||
#define RTSR_AL (1 << 0) /* RTC alarm detected */
|
||||
|
||||
#endif /* __ASM_MACH_REGS_RTC_H */
|
|
@ -92,6 +92,7 @@ static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);
|
|||
static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);
|
||||
static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);
|
||||
static APBC_CLK(gpio, PXA910_GPIO, 0, 13000000);
|
||||
static APBC_CLK(rtc, PXA910_RTC, 8, 32768);
|
||||
|
||||
static APMU_CLK(nand, NAND, 0x19b, 156000000);
|
||||
static APMU_CLK(u2o, USB, 0x1b, 480000000);
|
||||
|
@ -109,6 +110,7 @@ static struct clk_lookup pxa910_clkregs[] = {
|
|||
INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
|
||||
INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
|
||||
INIT_CLKREG(&clk_u2o, "pxa-u2o", "U2OCLK"),
|
||||
INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),
|
||||
};
|
||||
|
||||
static int __init pxa910_init(void)
|
||||
|
@ -183,3 +185,28 @@ struct platform_device pxa910_device_gpio = {
|
|||
.num_resources = ARRAY_SIZE(pxa910_resource_gpio),
|
||||
.resource = pxa910_resource_gpio,
|
||||
};
|
||||
|
||||
static struct resource pxa910_resource_rtc[] = {
|
||||
{
|
||||
.start = 0xd4010000,
|
||||
.end = 0xd401003f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
}, {
|
||||
.start = IRQ_PXA910_RTC_INT,
|
||||
.end = IRQ_PXA910_RTC_INT,
|
||||
.name = "rtc 1Hz",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
}, {
|
||||
.start = IRQ_PXA910_RTC_ALARM,
|
||||
.end = IRQ_PXA910_RTC_ALARM,
|
||||
.name = "rtc alarm",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
struct platform_device pxa910_device_rtc = {
|
||||
.name = "sa1100-rtc",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(pxa910_resource_rtc),
|
||||
.resource = pxa910_resource_rtc,
|
||||
};
|
||||
|
|
|
@ -124,6 +124,7 @@ static struct platform_device ttc_dkb_device_onenand = {
|
|||
|
||||
static struct platform_device *ttc_dkb_devices[] = {
|
||||
&pxa910_device_gpio,
|
||||
&pxa910_device_rtc,
|
||||
&ttc_dkb_device_onenand,
|
||||
};
|
||||
|
||||
|
|
|
@ -406,20 +406,17 @@ static struct resource pxa_rtc_resources[] = {
|
|||
[1] = {
|
||||
.start = IRQ_RTC1Hz,
|
||||
.end = IRQ_RTC1Hz,
|
||||
.name = "rtc 1Hz",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
[2] = {
|
||||
.start = IRQ_RTCAlrm,
|
||||
.end = IRQ_RTCAlrm,
|
||||
.name = "rtc alarm",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
struct platform_device sa1100_device_rtc = {
|
||||
.name = "sa1100-rtc",
|
||||
.id = -1,
|
||||
};
|
||||
|
||||
struct platform_device pxa_device_rtc = {
|
||||
.name = "pxa-rtc",
|
||||
.id = -1,
|
||||
|
@ -427,6 +424,27 @@ struct platform_device pxa_device_rtc = {
|
|||
.resource = pxa_rtc_resources,
|
||||
};
|
||||
|
||||
static struct resource sa1100_rtc_resources[] = {
|
||||
{
|
||||
.start = IRQ_RTC1Hz,
|
||||
.end = IRQ_RTC1Hz,
|
||||
.name = "rtc 1Hz",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
}, {
|
||||
.start = IRQ_RTCAlrm,
|
||||
.end = IRQ_RTCAlrm,
|
||||
.name = "rtc alarm",
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
struct platform_device sa1100_device_rtc = {
|
||||
.name = "sa1100-rtc",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(sa1100_rtc_resources),
|
||||
.resource = sa1100_rtc_resources,
|
||||
};
|
||||
|
||||
static struct resource pxa_ac97_resources[] = {
|
||||
[0] = {
|
||||
.start = 0x40500000,
|
||||
|
|
|
@ -209,6 +209,7 @@ static struct clk_lookup pxa25x_clkregs[] = {
|
|||
INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
|
||||
INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
|
||||
INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
|
||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
||||
};
|
||||
|
||||
static struct clk_lookup pxa25x_hwuart_clkreg =
|
||||
|
|
|
@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = {
|
|||
INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
|
||||
INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
|
||||
INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
|
||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
|
|
@ -89,6 +89,7 @@ static struct clk_lookup pxa3xx_clkregs[] = {
|
|||
INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL),
|
||||
INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL),
|
||||
INIT_CLKREG(&clk_pxa3xx_gpio, "pxa-gpio", NULL),
|
||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
|
|
@ -231,6 +231,7 @@ static struct clk_lookup pxa95x_clkregs[] = {
|
|||
INIT_CLKREG(&clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL),
|
||||
INIT_CLKREG(&clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL),
|
||||
INIT_CLKREG(&clk_pxa95x_gpio, "pxa-gpio", NULL),
|
||||
INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
|
||||
};
|
||||
|
||||
void __init pxa95x_init_irq(void)
|
||||
|
|
|
@ -11,17 +11,29 @@
|
|||
#include <linux/clk.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/clkdev.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
/*
|
||||
* Very simple clock implementation - we only have one clock to deal with.
|
||||
*/
|
||||
struct clkops {
|
||||
void (*enable)(struct clk *);
|
||||
void (*disable)(struct clk *);
|
||||
};
|
||||
|
||||
struct clk {
|
||||
const struct clkops *ops;
|
||||
unsigned int enabled;
|
||||
};
|
||||
|
||||
static void clk_gpio27_enable(void)
|
||||
#define DEFINE_CLK(_name, _ops) \
|
||||
struct clk clk_##_name = { \
|
||||
.ops = _ops, \
|
||||
}
|
||||
|
||||
static DEFINE_SPINLOCK(clocks_lock);
|
||||
|
||||
static void clk_gpio27_enable(struct clk *clk)
|
||||
{
|
||||
/*
|
||||
* First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:
|
||||
|
@ -32,38 +44,24 @@ static void clk_gpio27_enable(void)
|
|||
TUCR = TUCR_3_6864MHz;
|
||||
}
|
||||
|
||||
static void clk_gpio27_disable(void)
|
||||
static void clk_gpio27_disable(struct clk *clk)
|
||||
{
|
||||
TUCR = 0;
|
||||
GPDR &= ~GPIO_32_768kHz;
|
||||
GAFR &= ~GPIO_32_768kHz;
|
||||
}
|
||||
|
||||
static struct clk clk_gpio27;
|
||||
|
||||
static DEFINE_SPINLOCK(clocks_lock);
|
||||
|
||||
struct clk *clk_get(struct device *dev, const char *id)
|
||||
{
|
||||
const char *devname = dev_name(dev);
|
||||
|
||||
return strcmp(devname, "sa1111.0") ? ERR_PTR(-ENOENT) : &clk_gpio27;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get);
|
||||
|
||||
void clk_put(struct clk *clk)
|
||||
{
|
||||
}
|
||||
EXPORT_SYMBOL(clk_put);
|
||||
|
||||
int clk_enable(struct clk *clk)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&clocks_lock, flags);
|
||||
if (clk->enabled++ == 0)
|
||||
clk_gpio27_enable();
|
||||
spin_unlock_irqrestore(&clocks_lock, flags);
|
||||
if (clk) {
|
||||
spin_lock_irqsave(&clocks_lock, flags);
|
||||
if (clk->enabled++ == 0)
|
||||
clk->ops->enable(clk);
|
||||
spin_unlock_irqrestore(&clocks_lock, flags);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_enable);
|
||||
|
@ -72,17 +70,31 @@ void clk_disable(struct clk *clk)
|
|||
{
|
||||
unsigned long flags;
|
||||
|
||||
WARN_ON(clk->enabled == 0);
|
||||
|
||||
spin_lock_irqsave(&clocks_lock, flags);
|
||||
if (--clk->enabled == 0)
|
||||
clk_gpio27_disable();
|
||||
spin_unlock_irqrestore(&clocks_lock, flags);
|
||||
if (clk) {
|
||||
WARN_ON(clk->enabled == 0);
|
||||
spin_lock_irqsave(&clocks_lock, flags);
|
||||
if (--clk->enabled == 0)
|
||||
clk->ops->disable(clk);
|
||||
spin_unlock_irqrestore(&clocks_lock, flags);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(clk_disable);
|
||||
|
||||
unsigned long clk_get_rate(struct clk *clk)
|
||||
const struct clkops clk_gpio27_ops = {
|
||||
.enable = clk_gpio27_enable,
|
||||
.disable = clk_gpio27_disable,
|
||||
};
|
||||
|
||||
static DEFINE_CLK(gpio27, &clk_gpio27_ops);
|
||||
|
||||
static struct clk_lookup sa11xx_clkregs[] = {
|
||||
CLKDEV_INIT("sa1111.0", NULL, &clk_gpio27),
|
||||
CLKDEV_INIT("sa1100-rtc", NULL, NULL),
|
||||
};
|
||||
|
||||
static int __init sa11xx_clk_init(void)
|
||||
{
|
||||
return 3686400;
|
||||
clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs));
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_rate);
|
||||
core_initcall(sa11xx_clk_init);
|
||||
|
|
|
@ -345,9 +345,17 @@ void sa11x0_register_irda(struct irda_platform_data *irda)
|
|||
sa11x0_register_device(&sa11x0ir_device, irda);
|
||||
}
|
||||
|
||||
static struct resource sa1100_rtc_resources[] = {
|
||||
DEFINE_RES_MEM(0x90010000, 0x9001003f),
|
||||
DEFINE_RES_IRQ_NAMED(IRQ_RTC1Hz, "rtc 1Hz"),
|
||||
DEFINE_RES_IRQ_NAMED(IRQ_RTCAlrm, "rtc alarm"),
|
||||
};
|
||||
|
||||
static struct platform_device sa11x0rtc_device = {
|
||||
.name = "sa1100-rtc",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(sa1100_rtc_resources),
|
||||
.resource = sa1100_rtc_resources,
|
||||
};
|
||||
|
||||
static struct platform_device *sa11x0_devices[] __initdata = {
|
||||
|
|
|
@ -773,8 +773,8 @@ config RTC_DRV_EP93XX
|
|||
will be called rtc-ep93xx.
|
||||
|
||||
config RTC_DRV_SA1100
|
||||
tristate "SA11x0/PXA2xx"
|
||||
depends on ARCH_SA1100 || ARCH_PXA
|
||||
tristate "SA11x0/PXA2xx/PXA910"
|
||||
depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
|
||||
help
|
||||
If you say Y here you will get access to the real time clock
|
||||
built into your SA11x0 or PXA2xx CPU.
|
||||
|
|
|
@ -23,10 +23,12 @@
|
|||
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/rtc.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/bitops.h>
|
||||
|
@ -34,83 +36,30 @@
|
|||
#include <mach/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_PXA
|
||||
#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
|
||||
#include <mach/regs-rtc.h>
|
||||
#endif
|
||||
|
||||
#define RTC_DEF_DIVIDER (32768 - 1)
|
||||
#define RTC_DEF_TRIM 0
|
||||
#define RTC_FREQ 1024
|
||||
|
||||
static const unsigned long RTC_FREQ = 1024;
|
||||
static struct rtc_time rtc_alarm;
|
||||
static DEFINE_SPINLOCK(sa1100_rtc_lock);
|
||||
|
||||
static inline int rtc_periodic_alarm(struct rtc_time *tm)
|
||||
{
|
||||
return (tm->tm_year == -1) ||
|
||||
((unsigned)tm->tm_mon >= 12) ||
|
||||
((unsigned)(tm->tm_mday - 1) >= 31) ||
|
||||
((unsigned)tm->tm_hour > 23) ||
|
||||
((unsigned)tm->tm_min > 59) ||
|
||||
((unsigned)tm->tm_sec > 59);
|
||||
}
|
||||
|
||||
/*
|
||||
* Calculate the next alarm time given the requested alarm time mask
|
||||
* and the current time.
|
||||
*/
|
||||
static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
|
||||
struct rtc_time *alrm)
|
||||
{
|
||||
unsigned long next_time;
|
||||
unsigned long now_time;
|
||||
|
||||
next->tm_year = now->tm_year;
|
||||
next->tm_mon = now->tm_mon;
|
||||
next->tm_mday = now->tm_mday;
|
||||
next->tm_hour = alrm->tm_hour;
|
||||
next->tm_min = alrm->tm_min;
|
||||
next->tm_sec = alrm->tm_sec;
|
||||
|
||||
rtc_tm_to_time(now, &now_time);
|
||||
rtc_tm_to_time(next, &next_time);
|
||||
|
||||
if (next_time < now_time) {
|
||||
/* Advance one day */
|
||||
next_time += 60 * 60 * 24;
|
||||
rtc_time_to_tm(next_time, next);
|
||||
}
|
||||
}
|
||||
|
||||
static int rtc_update_alarm(struct rtc_time *alrm)
|
||||
{
|
||||
struct rtc_time alarm_tm, now_tm;
|
||||
unsigned long now, time;
|
||||
int ret;
|
||||
|
||||
do {
|
||||
now = RCNR;
|
||||
rtc_time_to_tm(now, &now_tm);
|
||||
rtc_next_alarm_time(&alarm_tm, &now_tm, alrm);
|
||||
ret = rtc_tm_to_time(&alarm_tm, &time);
|
||||
if (ret != 0)
|
||||
break;
|
||||
|
||||
RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL);
|
||||
RTAR = time;
|
||||
} while (now != RCNR);
|
||||
|
||||
return ret;
|
||||
}
|
||||
struct sa1100_rtc {
|
||||
spinlock_t lock;
|
||||
int irq_1hz;
|
||||
int irq_alarm;
|
||||
struct rtc_device *rtc;
|
||||
struct clk *clk;
|
||||
};
|
||||
|
||||
static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev_id);
|
||||
struct rtc_device *rtc = platform_get_drvdata(pdev);
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev_id);
|
||||
struct rtc_device *rtc = info->rtc;
|
||||
unsigned int rtsr;
|
||||
unsigned long events = 0;
|
||||
|
||||
spin_lock(&sa1100_rtc_lock);
|
||||
spin_lock(&info->lock);
|
||||
|
||||
rtsr = RTSR;
|
||||
/* clear interrupt sources */
|
||||
|
@ -146,30 +95,30 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
|
|||
|
||||
rtc_update_irq(rtc, 1, events);
|
||||
|
||||
if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
|
||||
rtc_update_alarm(&rtc_alarm);
|
||||
|
||||
spin_unlock(&sa1100_rtc_lock);
|
||||
spin_unlock(&info->lock);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int sa1100_rtc_open(struct device *dev)
|
||||
{
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
struct rtc_device *rtc = info->rtc;
|
||||
int ret;
|
||||
struct platform_device *plat_dev = to_platform_device(dev);
|
||||
struct rtc_device *rtc = platform_get_drvdata(plat_dev);
|
||||
|
||||
ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
|
||||
ret = clk_prepare_enable(info->clk);
|
||||
if (ret)
|
||||
goto fail_clk;
|
||||
ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
|
||||
"rtc 1Hz", dev);
|
||||
if (ret) {
|
||||
dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
|
||||
dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
|
||||
goto fail_ui;
|
||||
}
|
||||
ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
|
||||
ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
|
||||
"rtc Alrm", dev);
|
||||
if (ret) {
|
||||
dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
|
||||
dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
|
||||
goto fail_ai;
|
||||
}
|
||||
rtc->max_user_freq = RTC_FREQ;
|
||||
|
@ -178,29 +127,36 @@ static int sa1100_rtc_open(struct device *dev)
|
|||
return 0;
|
||||
|
||||
fail_ai:
|
||||
free_irq(IRQ_RTC1Hz, dev);
|
||||
free_irq(info->irq_1hz, dev);
|
||||
fail_ui:
|
||||
clk_disable_unprepare(info->clk);
|
||||
fail_clk:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void sa1100_rtc_release(struct device *dev)
|
||||
{
|
||||
spin_lock_irq(&sa1100_rtc_lock);
|
||||
RTSR = 0;
|
||||
spin_unlock_irq(&sa1100_rtc_lock);
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
|
||||
free_irq(IRQ_RTCAlrm, dev);
|
||||
free_irq(IRQ_RTC1Hz, dev);
|
||||
spin_lock_irq(&info->lock);
|
||||
RTSR = 0;
|
||||
spin_unlock_irq(&info->lock);
|
||||
|
||||
free_irq(info->irq_alarm, dev);
|
||||
free_irq(info->irq_1hz, dev);
|
||||
clk_disable_unprepare(info->clk);
|
||||
}
|
||||
|
||||
static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
|
||||
{
|
||||
spin_lock_irq(&sa1100_rtc_lock);
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
|
||||
spin_lock_irq(&info->lock);
|
||||
if (enabled)
|
||||
RTSR |= RTSR_ALE;
|
||||
else
|
||||
RTSR &= ~RTSR_ALE;
|
||||
spin_unlock_irq(&sa1100_rtc_lock);
|
||||
spin_unlock_irq(&info->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -225,7 +181,6 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
|
|||
{
|
||||
u32 rtsr;
|
||||
|
||||
memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time));
|
||||
rtsr = RTSR;
|
||||
alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0;
|
||||
alrm->pending = (rtsr & RTSR_AL) ? 1 : 0;
|
||||
|
@ -234,17 +189,22 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
|
|||
|
||||
static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
|
||||
{
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
unsigned long time;
|
||||
int ret;
|
||||
|
||||
spin_lock_irq(&sa1100_rtc_lock);
|
||||
ret = rtc_update_alarm(&alrm->time);
|
||||
if (ret == 0) {
|
||||
if (alrm->enabled)
|
||||
RTSR |= RTSR_ALE;
|
||||
else
|
||||
RTSR &= ~RTSR_ALE;
|
||||
}
|
||||
spin_unlock_irq(&sa1100_rtc_lock);
|
||||
spin_lock_irq(&info->lock);
|
||||
ret = rtc_tm_to_time(&alrm->time, &time);
|
||||
if (ret != 0)
|
||||
goto out;
|
||||
RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL);
|
||||
RTAR = time;
|
||||
if (alrm->enabled)
|
||||
RTSR |= RTSR_ALE;
|
||||
else
|
||||
RTSR &= ~RTSR_ALE;
|
||||
out:
|
||||
spin_unlock_irq(&info->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -271,6 +231,27 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
|
|||
static int sa1100_rtc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct rtc_device *rtc;
|
||||
struct sa1100_rtc *info;
|
||||
int irq_1hz, irq_alarm, ret = 0;
|
||||
|
||||
irq_1hz = platform_get_irq_byname(pdev, "rtc 1Hz");
|
||||
irq_alarm = platform_get_irq_byname(pdev, "rtc alarm");
|
||||
if (irq_1hz < 0 || irq_alarm < 0)
|
||||
return -ENODEV;
|
||||
|
||||
info = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);
|
||||
if (!info)
|
||||
return -ENOMEM;
|
||||
info->clk = clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(info->clk)) {
|
||||
dev_err(&pdev->dev, "failed to find rtc clock source\n");
|
||||
ret = PTR_ERR(info->clk);
|
||||
goto err_clk;
|
||||
}
|
||||
info->irq_1hz = irq_1hz;
|
||||
info->irq_alarm = irq_alarm;
|
||||
spin_lock_init(&info->lock);
|
||||
platform_set_drvdata(pdev, info);
|
||||
|
||||
/*
|
||||
* According to the manual we should be able to let RTTR be zero
|
||||
|
@ -292,10 +273,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
|
|||
rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
|
||||
THIS_MODULE);
|
||||
|
||||
if (IS_ERR(rtc))
|
||||
return PTR_ERR(rtc);
|
||||
|
||||
platform_set_drvdata(pdev, rtc);
|
||||
if (IS_ERR(rtc)) {
|
||||
ret = PTR_ERR(rtc);
|
||||
goto err_dev;
|
||||
}
|
||||
info->rtc = rtc;
|
||||
|
||||
/* Fix for a nasty initialization problem the in SA11xx RTSR register.
|
||||
* See also the comments in sa1100_rtc_interrupt().
|
||||
|
@ -322,14 +304,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
|
|||
RTSR = RTSR_AL | RTSR_HZ;
|
||||
|
||||
return 0;
|
||||
err_dev:
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
clk_put(info->clk);
|
||||
err_clk:
|
||||
kfree(info);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sa1100_rtc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rtc_device *rtc = platform_get_drvdata(pdev);
|
||||
struct sa1100_rtc *info = platform_get_drvdata(pdev);
|
||||
|
||||
if (rtc)
|
||||
rtc_device_unregister(rtc);
|
||||
if (info) {
|
||||
rtc_device_unregister(info->rtc);
|
||||
clk_put(info->clk);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
kfree(info);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -337,15 +329,17 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
|
|||
#ifdef CONFIG_PM
|
||||
static int sa1100_rtc_suspend(struct device *dev)
|
||||
{
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
if (device_may_wakeup(dev))
|
||||
enable_irq_wake(IRQ_RTCAlrm);
|
||||
enable_irq_wake(info->irq_alarm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sa1100_rtc_resume(struct device *dev)
|
||||
{
|
||||
struct sa1100_rtc *info = dev_get_drvdata(dev);
|
||||
if (device_may_wakeup(dev))
|
||||
disable_irq_wake(IRQ_RTCAlrm);
|
||||
disable_irq_wake(info->irq_alarm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue