The patch titled
Subject: rtc: pl031: fix up IRQ flags
has been added to the -mm tree. Its filename is
rtc-pl031-fix-up-irq-flags.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Subject: rtc: pl031: fix up IRQ flags
The pl031 interrupt is shared between the timer part and the clockwatch
part of the same HW block on the ux500, so mark it IRQF_SHARED on this
variant.
This patch also adds the IRQF_NO_SUSPEND flag to the rtc irq on all
variants as we don't want this pretty important IRQ to be disabled in
suspend.
Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Reviewed-by: Rickard Andersson <rickard.andersson@xxxxxxxxxxxxxx>
Reviewed-by: Jonas Aberg <jonas.aberg@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-pl031.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-pl031.c~rtc-pl031-fix-up-irq-flags drivers/rtc/rtc-pl031.c
--- a/drivers/rtc/rtc-pl031.c~rtc-pl031-fix-up-irq-flags
+++ a/drivers/rtc/rtc-pl031.c
@@ -75,11 +75,13 @@
* clockwatch function
* @st_weekday: if this is an ST Microelectronics silicon version that need
* the weekday fix
+ * @irqflags: special IRQ flags per variant
*/
struct pl031_vendor_data {
struct rtc_class_ops ops;
bool clockwatch;
bool st_weekday;
+ unsigned long irqflags;
};
struct pl031_local {
@@ -373,7 +375,7 @@ static int pl031_probe(struct amba_devic
}
if (request_irq(adev->irq[0], pl031_interrupt,
- 0, "rtc-pl031", ldata)) {
+ vendor->irqflags, "rtc-pl031", ldata)) {
ret = -EIO;
goto out_no_irq;
}
@@ -403,6 +405,7 @@ static struct pl031_vendor_data arm_pl03
.set_alarm = pl031_set_alarm,
.alarm_irq_enable = pl031_alarm_irq_enable,
},
+ .irqflags = IRQF_NO_SUSPEND,
};
/* The First ST derivative */
@@ -416,6 +419,7 @@ static struct pl031_vendor_data stv1_pl0
},
.clockwatch = true,
.st_weekday = true,
+ .irqflags = IRQF_NO_SUSPEND,
};
/* And the second ST derivative */
@@ -429,6 +433,11 @@ static struct pl031_vendor_data stv2_pl0
},
.clockwatch = true,
.st_weekday = true,
+ /*
+ * This variant shares the IRQ with another block and must not
+ * suspend that IRQ line.
+ */
+ .irqflags = IRQF_SHARED | IRQF_NO_SUSPEND,
};
static struct amba_id pl031_ids[] = {
_
Subject: Subject: rtc: pl031: fix up IRQ flags
Patches currently in -mm which might be from mattias.wallin@xxxxxxxxxxxxxx are
rtc-pl031-fix-up-irq-flags.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
