From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 30 Jun 2020 09:32:02 +0000 (+0200)
Subject: Merge tag 'v5.8-rc3' into arm/qcom
X-Git-Tag: v5.10.7~1870^2~1^3~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77346a704c913268a2dad68d59523fd85dc74088;p=platform%2Fkernel%2Flinux-rpi.git

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

Linux 5.8-rc3
---

77346a704c913268a2dad68d59523fd85dc74088
diff --cc drivers/iommu/qcom_iommu.c
index 116d818,c3e1fbd..801768c
--- a/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)) {