iommu/arm-smmu: fix architecture version detection
authorRobin Murphy <Robin.Murphy@arm.com>
Thu, 28 Aug 2014 16:51:59 +0000 (17:51 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 16 Sep 2014 18:15:21 +0000 (19:15 +0100)
The SMMU driver was relying on a quirk of MMU-500 r2px to identify
the correct architecture version. Since this does not apply to other
implementations, make the architecture version for each supported
implementation explicit.

While we're at it, remove the unnecessary #ifdef since the dependencies
for CONFIG_ARM_SMMU already imply CONFIG_OF.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/arm-smmu.c

Simple merge