diff options
| author |   Robin Murphy <robin.murphy@arm.com> | 2019-08-15 19:37:32 +0100 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2019-08-19 16:52:47 +0100 |
| commit | c5fc64881f073504581ac55132e30f02ee61320b (patch) | |
| tree | 35337f7b6b6f5b37d297e0a6202b8582f88725bf | |
| parent | iommu/arm-smmu: Abstract GR0 accesses (diff) | |
| download | linux-dev-c5fc64881f073504581ac55132e30f02ee61320b.tar.xz linux-dev-c5fc64881f073504581ac55132e30f02ee61320b.zip | |
iommu/arm-smmu: Rename arm-smmu-regs.h
We're about to start using it for more than just register definitions,
so generalise the name.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/arm-smmu.h (renamed from drivers/iommu/arm-smmu-regs.h) | 6 | ||||
| -rw-r--r-- | drivers/iommu/qcom_iommu.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index e9fd9117109e..f3b8301a3059 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -46,7 +46,7 @@ #include <linux/amba/bus.h> #include <linux/fsl/mc.h> -#include "arm-smmu-regs.h" +#include "arm-smmu.h" /* * Apparently, some Qualcomm arm64 platforms which appear to expose their SMMU diff --git a/drivers/iommu/arm-smmu-regs.h b/drivers/iommu/arm-smmu.h index a8e288192285..ccc3097a4247 100644 --- a/drivers/iommu/arm-smmu-regs.h +++ b/drivers/iommu/arm-smmu.h @@ -7,8 +7,8 @@ * Author: Will Deacon <will.deacon@arm.com> */ -#ifndef _ARM_SMMU_REGS_H -#define _ARM_SMMU_REGS_H +#ifndef _ARM_SMMU_H +#define _ARM_SMMU_H #include <linux/bits.h> @@ -194,4 +194,4 @@ enum arm_smmu_cbar_type { #define ARM_SMMU_CB_ATSR 0x8f0 #define ATSR_ACTIVE BIT(0) -#endif /* _ARM_SMMU_REGS_H */ +#endif /* _ARM_SMMU_H */ diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index 60a125dd7300..a2062d13584f 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -33,7 +33,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include "arm-smmu-regs.h" +#include "arm-smmu.h" #define SMMU_INTR_SEL_NS 0x2000 |