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

Commit b0c560f7 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: Clean up of_iommu_init_fn 



Now that no more drivers rely on arbitrary early initialisation via an
of_iommu_init_fn hook, let's clean up the redundant remnants. The
IOMMU_OF_DECLARE() macro needs to remain for now, as the probe-deferral
mechanism has no other nice way to detect built-in drivers before they
have registered themselves, such that it can make the right decision.

Reviewed-by: default avatarSricharan R <sricharan@codeaurora.org>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent e7747d88

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2962,7 +2962,7 @@ static struct platform_driver arm_smmu_driver = { 
};

module_platform_driver(arm_smmu_driver);



IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3", NULL);

IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3");



MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");

MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

drivers/iommu/arm-smmu.c

+6 −6
Original line number Diff line number Diff line
@@ -2211,12 +2211,12 @@ static struct platform_driver arm_smmu_driver = { 
};

module_platform_driver(arm_smmu_driver);



IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1", NULL);

IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2", NULL);

IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400", NULL);

IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401", NULL);

IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500", NULL);

IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2", NULL);

IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1");

IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2");

IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400");

IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401");

IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500");

IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2");



MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");

MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

drivers/iommu/exynos-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1394,4 +1394,4 @@ static int __init exynos_iommu_init(void) 
}

core_initcall(exynos_iommu_init);



IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu", NULL);
 
IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu");

drivers/iommu/ipmmu-vmsa.c

+2 −2
Original line number Diff line number Diff line
@@ -1108,8 +1108,8 @@ static void __exit ipmmu_exit(void) 
subsys_initcall(ipmmu_init);

module_exit(ipmmu_exit);



IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", NULL);

IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", NULL);

IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");

IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");



MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");

MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");

drivers/iommu/msm_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static void __exit msm_iommu_driver_exit(void) 
subsys_initcall(msm_iommu_driver_init);

module_exit(msm_iommu_driver_exit);



IOMMU_OF_DECLARE(msm_iommu_of, "qcom,apq8064-iommu", NULL);

IOMMU_OF_DECLARE(msm_iommu_of, "qcom,apq8064-iommu");



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Stepan Moskovchenko <stepanm@codeaurora.org>");