Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 647c3c7fd742..1599354e974d 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1167,7 +1167,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
         for (i = 0; i < master->num_streamids; ++i) {
                 u32 idx, s2cr;
                 idx = master->smrs ? master->smrs[i].idx : master->streamids[i];
-                s2cr = (S2CR_TYPE_TRANS << S2CR_TYPE_SHIFT) |
+                s2cr = S2CR_TYPE_TRANS |
                        (smmu_domain->root_cfg.cbndx << S2CR_CBNDX_SHIFT);
                 writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx));
         }
@@ -1804,7 +1804,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
          * allocation (PTRS_PER_PGD).
          */
 #ifdef CONFIG_64BIT
-        smmu->s1_output_size = min(39UL, size);
+        smmu->s1_output_size = min((unsigned long)VA_BITS, size);
 #else
         smmu->s1_output_size = min(32UL, size);
 #endif