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

Commit c5fc6488 authored Aug 15, 2019 by Robin Murphy Committed by Will Deacon Aug 19, 2019

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>

parent 00320ce6

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@
	#include <linux/amba/bus.h>		#include <linux/amba/bus.h>
	#include <linux/fsl/mc.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		* Apparently, some Qualcomm arm64 platforms which appear to expose their SMMU

drivers/iommu/arm-smmu-regs.h→drivers/iommu/arm-smmu.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,8 @@
	* Author: Will Deacon <will.deacon@arm.com>		* Author: Will Deacon <will.deacon@arm.com>
	*/		*/

	#ifndef _ARM_SMMU_REGS_H		#ifndef _ARM_SMMU_H
	#define _ARM_SMMU_REGS_H		#define _ARM_SMMU_H

	#include <linux/bits.h>		#include <linux/bits.h>

	@@ -194,4 +194,4 @@ enum arm_smmu_cbar_type {
	#define ARM_SMMU_CB_ATSR 0x8f0		#define ARM_SMMU_CB_ATSR 0x8f0
	#define ATSR_ACTIVE BIT(0)		#define ATSR_ACTIVE BIT(0)

	#endif /* _ARM_SMMU_REGS_H */		#endif /* _ARM_SMMU_H */

drivers/iommu/qcom_iommu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/spinlock.h>		#include <linux/spinlock.h>

	#include "arm-smmu-regs.h"		#include "arm-smmu.h"

	#define SMMU_INTR_SEL_NS 0x2000		#define SMMU_INTR_SEL_NS 0x2000