diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 12:51:17 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 12:51:17 -0400 |
| commit | b71c5d14e5999e5a6cb8dcb067524219c6bbb95d (patch) | |
| tree | b7e5c67857cfb3b026f7ffe437390b781f7b1d5e | |
| parent | 64b063c926d6d403dd67c0fd5517767b76e03b85 (diff) | |
| download | longterm-queue-4.12-b71c5d14e5999e5a6cb8dcb067524219c6bbb95d.tar.gz | |
rtc: refresh pl031 patch ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/rtc-pl031-make-interrupt-optional.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/rtc-pl031-make-interrupt-optional.patch b/queue/rtc-pl031-make-interrupt-optional.patch index cc2f3a0..449f501 100644 --- a/queue/rtc-pl031-make-interrupt-optional.patch +++ b/queue/rtc-pl031-make-interrupt-optional.patch @@ -1,4 +1,4 @@ -From 5b64a2965dfdfca8039e93303c64e2b15c19ff0c Mon Sep 17 00:00:00 2001 +From fea924b4b89bef6bbbb03ee1310c68c48043ddc0 Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@armlinux.org.uk> Date: Fri, 29 Sep 2017 11:22:15 +0100 Subject: [PATCH] rtc: pl031: make interrupt optional @@ -11,9 +11,10 @@ trying to claim the interrupt if it's not specified. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c -index 64c77ec1b4ea..82eb7da2c478 100644 +index e1687e19c59f..a30f24cb6c83 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -308,7 +308,8 @@ static int pl031_remove(struct amba_device *adev) @@ -24,10 +25,10 @@ index 64c77ec1b4ea..82eb7da2c478 100644 + if (adev->irq[0]) + free_irq(adev->irq[0], ldata); rtc_device_unregister(ldata->rtc); - amba_release_regions(adev); - -@@ -389,12 +390,13 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) - goto out; + iounmap(ldata->base); + kfree(ldata); +@@ -381,12 +382,13 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) + goto out_no_rtc; } - if (request_irq(adev->irq[0], pl031_interrupt, |