Merge tag 'v5.8-rc3' into arm/qcom

Linux 5.8-rc3

diff --cc drivers/iommu/qcom_iommu.c
index 116d818,c3e1fbd..801768c
--- 1/drivers/iommu/qcom_iommu.c
--- 2/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@@ -805,29 -814,23 +795,32 @@@ static int qcom_iommu_device_probe(stru
        qcom_iommu->dev = dev;
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res)
+       if (res) {
                qcom_iommu->local_base = devm_ioremap_resource(dev, res);
+               if (IS_ERR(qcom_iommu->local_base))
+                       return PTR_ERR(qcom_iommu->local_base);
+       }
  
 -      qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
 -      if (IS_ERR(qcom_iommu->iface_clk)) {
 +      clk = devm_clk_get(dev, "iface");
 +      if (IS_ERR(clk)) {
                dev_err(dev, "failed to get iface clock\n");
 -              return PTR_ERR(qcom_iommu->iface_clk);
 +              return PTR_ERR(clk);
        }
 +      qcom_iommu->clks[CLK_IFACE].clk = clk;
  
 -      qcom_iommu->bus_clk = devm_clk_get(dev, "bus");
 -      if (IS_ERR(qcom_iommu->bus_clk)) {
 +      clk = devm_clk_get(dev, "bus");
 +      if (IS_ERR(clk)) {
                dev_err(dev, "failed to get bus clock\n");
 -              return PTR_ERR(qcom_iommu->bus_clk);
 +              return PTR_ERR(clk);
 +      }
 +      qcom_iommu->clks[CLK_BUS].clk = clk;
 +
 +      clk = devm_clk_get_optional(dev, "tbu");
 +      if (IS_ERR(clk)) {
 +              dev_err(dev, "failed to get tbu clock\n");
 +              return PTR_ERR(clk);
        }
 +      qcom_iommu->clks[CLK_TBU].clk = clk;
  
        if (of_property_read_u32(dev->of_node, "qcom,iommu-secure-id",
                                 &qcom_iommu->sec_id)) {