diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 0466a3a3eed5..9e445242f8ec 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -365,7 +365,8 @@ static void arm_smmu_arch_write_sync(struct arm_smmu_device *smmu)
 		return;
 
 	/* Read to complete prior write transcations */
-	id = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_ID0);
+	id = arm_smmu_readl(smmu, ARM_SMMU_IMPL_DEF0, 0);
+
 
 	/* Wait for read to complete before off */
 	rmb();
@@ -656,8 +657,6 @@ static void arm_smmu_power_off_atomic(struct arm_smmu_device *smmu,
 {
 	unsigned long flags;
 
-	arm_smmu_arch_write_sync(smmu);
-
 	spin_lock_irqsave(&pwr->clock_refs_lock, flags);
 	if (pwr->clock_refs_count == 0) {
 		WARN(1, "%s: bad clock_ref_count\n", dev_name(pwr->dev));
@@ -670,6 +669,7 @@ static void arm_smmu_power_off_atomic(struct arm_smmu_device *smmu,
 		return;
 	}
 
+	arm_smmu_arch_write_sync(smmu);
 	arm_smmu_disable_clocks(pwr);
 
 	pwr->clock_refs_count = 0;