Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00cb75c8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: msm: Add base physical address to drvdata structure"

parents d4692b77 cf10ac2f

arch/arm/mach-msm/include/mach/iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct msm_iommu_bfb_settings { 
 * struct msm_iommu_drvdata - A single IOMMU hardware instance

 * @base:	IOMMU config port base address (VA)

 * @glb_base:	IOMMU config port base address for global register space (VA)

 * @phys_base:  IOMMU physical base address.

 * @ncb		The number of contexts on this IOMMU

 * @irq:	Interrupt number

 * @clk:	The bus clock for this IOMMU hardware instance
@@ -110,6 +111,7 @@ struct msm_iommu_bfb_settings { 
 */

struct msm_iommu_drvdata {

	void __iomem *base;

	phys_addr_t phys_base;

	void __iomem *glb_base;

	void __iomem *cb_base;

	void __iomem *smmu_local_base;

drivers/iommu/msm_iommu_dev-v1.c

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ static int msm_iommu_probe(struct platform_device *pdev) 
	if (!drvdata->base)

		return -ENOMEM;



	drvdata->phys_base = r->start;



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM,

					"smmu_local_base");

	if (r) {