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

Commit c4dae24a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Remove 'qcom,power-always-on' property for SMMU"

parents 6edc453e eed034c5

drivers/iommu/arm-smmu.c

+3 −4
Original line number Diff line number Diff line
@@ -5115,9 +5115,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 
	 * management code in GKI results in slow unmap calls. To alleviate

	 * that, we can remove the latency incurred by enabling/disabling the

	 * power resources, by always keeping them on.

	 *

	 */

	if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON) &&

	    of_property_read_bool(dev->of_node, "qcom,power-always-on"))

	if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON))

		arm_smmu_power_on(smmu->pwr);



	/*
@@ -5176,8 +5176,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev) 
	arm_smmu_power_off(smmu, smmu->pwr);



	/* Remove the extra reference that was taken in the probe function */

	if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON) &&

	    of_property_read_bool(pdev->dev.of_node, "qcom,power-always-on"))

	if (IS_ENABLED(CONFIG_ARM_SMMU_POWER_ALWAYS_ON))

		arm_smmu_power_off(smmu, smmu->pwr);



	arm_smmu_exit_power_resources(smmu->pwr);