iommu/rockchip: make clock handling optional

A patch from »iommu/rockchip: fix clock handling to not break old dts« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Mon, 9 Apr 2018 23:01:35 +0200

Commit-Message

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@...>

Patch-Comment

drivers/iommu/rockchip-iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

Statistics

  • 6 lines added
  • 2 lines removed

Changes

------------------------ drivers/iommu/rockchip-iommu.c ------------------------
index 5fc8656c60f9..7215c683cb8f 100644
@@ -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)
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...