git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-s3c.c
diff --git
a/drivers/rtc/rtc-s3c.c
b/drivers/rtc/rtc-s3c.c
index
625dad2
..
9a79a24
100644
(file)
--- a/
drivers/rtc/rtc-s3c.c
+++ b/
drivers/rtc/rtc-s3c.c
@@
-46,7
+46,7
@@
static unsigned int tick_count;
/* IRQ Handlers */
/* IRQ Handlers */
-static irqreturn_t s3c_rtc_alarmirq(int irq, void *id
, struct pt_regs *r
)
+static irqreturn_t s3c_rtc_alarmirq(int irq, void *id)
{
struct rtc_device *rdev = id;
{
struct rtc_device *rdev = id;
@@
-54,7
+54,7
@@
static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t s3c_rtc_tickirq(int irq, void *id
, struct pt_regs *r
)
+static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
{
struct rtc_device *rdev = id;
{
struct rtc_device *rdev = id;
@@
-191,6
+191,8
@@
static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
alm_en = readb(base + S3C2410_RTCALM);
alm_en = readb(base + S3C2410_RTCALM);
+ alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
+
pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
alm_en,
alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
alm_en,
alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
@@
-331,12
+333,8
@@
static int s3c_rtc_ioctl(struct device *dev,
static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
{
static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
{
- unsigned int rtcalm = readb(s3c_rtc_base + S3C2410_RTCALM);
unsigned int ticnt = readb(s3c_rtc_base + S3C2410_TICNT);
unsigned int ticnt = readb(s3c_rtc_base + S3C2410_TICNT);
- seq_printf(seq, "alarm_IRQ\t: %s\n",
- (rtcalm & S3C2410_RTCALM_ALMEN) ? "yes" : "no" );
-
seq_printf(seq, "periodic_IRQ\t: %s\n",
(ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" );
seq_printf(seq, "periodic_IRQ\t: %s\n",
(ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" );
@@
-352,7
+350,7
@@
static int s3c_rtc_open(struct device *dev)
int ret;
ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
int ret;
ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
-
SA_INTERRUPT
, "s3c2410-rtc alarm", rtc_dev);
+
IRQF_DISABLED
, "s3c2410-rtc alarm", rtc_dev);
if (ret) {
dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
if (ret) {
dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
@@
-360,7
+358,7
@@
static int s3c_rtc_open(struct device *dev)
}
ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
}
ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
-
SA_INTERRUPT
, "s3c2410-rtc tick", rtc_dev);
+
IRQF_DISABLED
, "s3c2410-rtc tick", rtc_dev);
if (ret) {
dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
if (ret) {
dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);