From: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
To: joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org
Cc: mark.rutland-5wv7dgnIgG8@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>,
robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org,
tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
robin.murphy-5wv7dgnIgG8@public.gmane.org,
tomeu-XCtybt49RKsYaV1qd6yewg@public.gmane.org
Subject: [PATCH 2/2] iommu/rockchip: make clock handling optional
Date: Tue, 10 Apr 2018 11:26:12 +0200 [thread overview]
Message-ID: <20180410092612.2653-3-heiko@sntech.de> (raw)
In-Reply-To: <20180410092612.2653-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
iommu clocks are optional, so the driver should not fail if they are not
present. Instead just set the number of clocks to 0, which the clk-blk APIs
can handle just fine.
Fixes: f2e3a5f557ad ("iommu/rockchip: Control clocks needed to access the IOMMU")
Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
---
drivers/iommu/rockchip-iommu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 5fc8656c60f9..7215c683cb8f 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1176,8 +1176,12 @@ static int rk_iommu_probe(struct platform_device *pdev)
iommu->clocks[i].id = rk_iommu_clocks[i];
err = devm_clk_bulk_get(iommu->dev, iommu->num_clocks, iommu->clocks);
- if (err)
- return err;
+ if (err) {
+ if (err == -ENOENT)
+ iommu->num_clocks = 0;
+ else
+ return err;
+ }
err = clk_bulk_prepare(iommu->num_clocks, iommu->clocks);
if (err)
--
2.16.2
next prev parent reply other threads:[~2018-04-10 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 9:26 [PATCH 0/2] iommu/rockchip: fix clock handling to not break old dts Heiko Stuebner
[not found] ` <20180410092612.2653-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
2018-04-10 9:26 ` [PATCH 1/2] dt-bindings: iommu/rockchip: Make clock properties optional Heiko Stuebner
[not found] ` <20180410092612.2653-2-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
2018-04-10 11:18 ` Robin Murphy
[not found] ` <99245ec4-6835-7fa7-3bad-dd21874f92c0-5wv7dgnIgG8@public.gmane.org>
2018-04-10 11:26 ` Heiko Stuebner
2018-04-13 21:02 ` Rob Herring
2018-04-17 12:01 ` Heiko Stuebner
2018-04-10 9:26 ` Heiko Stuebner [this message]
[not found] ` <20180410092612.2653-3-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
2018-04-10 11:24 ` [PATCH 2/2] iommu/rockchip: make clock handling optional Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180410092612.2653-3-heiko@sntech.de \
--to=heiko-4mtyjxux2i+zqb+pc5nmwq@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
--cc=tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=tomeu-XCtybt49RKsYaV1qd6yewg@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox