Merge "iommu: arm-smmu: enable clocks and regulators in smmu detach" (e0c5352a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/iommu/arm-smmu.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2214,14 +2214,14 @@ static void arm_smmu_detach_dev(struct iommu_domain *domain,
		return;
		}

		arm_smmu_domain_remove_master(smmu_domain, fwspec);
		if (atomic_domain)
		arm_smmu_power_on_atomic(smmu->pwr);
		else
		arm_smmu_power_on(smmu->pwr);

		/* Remove additional vote for atomic power */
		if (atomic_domain) {
		WARN_ON(arm_smmu_power_on_atomic(smmu->pwr));
		arm_smmu_domain_remove_master(smmu_domain, fwspec);
		arm_smmu_power_off(smmu->pwr);
		}
		}

		static int arm_smmu_assign_table(struct arm_smmu_domain *smmu_domain)
		{