aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-pl031.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index e66afb816d61..08378e3cc21c 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -75,11 +75,13 @@
75 * clockwatch function 75 * clockwatch function
76 * @st_weekday: if this is an ST Microelectronics silicon version that need 76 * @st_weekday: if this is an ST Microelectronics silicon version that need
77 * the weekday fix 77 * the weekday fix
78 * @irqflags: special IRQ flags per variant
78 */ 79 */
79struct pl031_vendor_data { 80struct pl031_vendor_data {
80 struct rtc_class_ops ops; 81 struct rtc_class_ops ops;
81 bool clockwatch; 82 bool clockwatch;
82 bool st_weekday; 83 bool st_weekday;
84 unsigned long irqflags;
83}; 85};
84 86
85struct pl031_local { 87struct pl031_local {
@@ -373,7 +375,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
373 } 375 }
374 376
375 if (request_irq(adev->irq[0], pl031_interrupt, 377 if (request_irq(adev->irq[0], pl031_interrupt,
376 0, "rtc-pl031", ldata)) { 378 vendor->irqflags, "rtc-pl031", ldata)) {
377 ret = -EIO; 379 ret = -EIO;
378 goto out_no_irq; 380 goto out_no_irq;
379 } 381 }
@@ -403,6 +405,7 @@ static struct pl031_vendor_data arm_pl031 = {
403 .set_alarm = pl031_set_alarm, 405 .set_alarm = pl031_set_alarm,
404 .alarm_irq_enable = pl031_alarm_irq_enable, 406 .alarm_irq_enable = pl031_alarm_irq_enable,
405 }, 407 },
408 .irqflags = IRQF_NO_SUSPEND,
406}; 409};
407 410
408/* The First ST derivative */ 411/* The First ST derivative */
@@ -416,6 +419,7 @@ static struct pl031_vendor_data stv1_pl031 = {
416 }, 419 },
417 .clockwatch = true, 420 .clockwatch = true,
418 .st_weekday = true, 421 .st_weekday = true,
422 .irqflags = IRQF_NO_SUSPEND,
419}; 423};
420 424
421/* And the second ST derivative */ 425/* And the second ST derivative */
@@ -429,6 +433,11 @@ static struct pl031_vendor_data stv2_pl031 = {
429 }, 433 },
430 .clockwatch = true, 434 .clockwatch = true,
431 .st_weekday = true, 435 .st_weekday = true,
436 /*
437 * This variant shares the IRQ with another block and must not
438 * suspend that IRQ line.
439 */
440 .irqflags = IRQF_SHARED | IRQF_NO_SUSPEND,
432}; 441};
433 442
434static struct amba_id pl031_ids[] = { 443static struct amba_id pl031_ids[] = {