summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2017-09-06 10:40:11 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2017-10-11 15:16:43 +0200
commit2532fa8e1faf66f5ee0dc52a5deafaba74a96562 (patch)
treef25780f1ab26efcf5a379a3608bfafe34bc0ea9c /configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch
parent71edf02b1f3e89582e268420e66c401040a197ca (diff)
downloadDistroKit-2532fa8e1faf66f5ee0dc52a5deafaba74a96562.tar.gz
DistroKit-2532fa8e1faf66f5ee0dc52a5deafaba74a96562.tar.xz
platform-v7a: barebox: use reworked vexpress patches
The vexpress patch series has recently been reworked. Use it. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Reviewed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch')
-rw-r--r--configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch b/configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch
new file mode 100644
index 0000000..e61865e
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2017.08.0/0004-clocksource-sp804-silently-ignore-secondary-instaces.patch
@@ -0,0 +1,28 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Fri, 1 Sep 2017 18:54:54 +0200
+Subject: [PATCH] clocksource: sp804: silently ignore secondary instaces
+
+When probing from an upstream DT, we don't always have influence on
+how many timer instances are enabled. Just use the first one and
+silently skip the other instances.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+---
+ drivers/clocksource/amba-sp804.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/clocksource/amba-sp804.c b/drivers/clocksource/amba-sp804.c
+index c5ad9947cd96..66e3988b4cf8 100644
+--- a/drivers/clocksource/amba-sp804.c
++++ b/drivers/clocksource/amba-sp804.c
+@@ -35,8 +35,8 @@ static int sp804_probe(struct amba_device *dev, const struct amba_id *id)
+ int ret;
+
+ if (sp804_base) {
+- dev_err(&dev->dev, "single instance driver\n");
+- return -EBUSY;
++ dev_dbg(&dev->dev, "skipping secondary instance\n");
++ return 0;
+ }
+
+ sp804_clk = clk_get(&dev->dev, NULL);