Commit 66a28915 authored by Yong Wu's avatar Yong Wu Committed by Will Deacon
Browse files

iommu/mediatek: Use the common mtk-memory-port.h 



Use the common memory header(larb-port) in the source code.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-9-yong.wu@mediatek.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent fc373469

drivers/iommu/mtk_iommu.c

+0 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ 


#define MTK_PROTECT_PA_ALIGN			256



/*

 * Get the local arbiter ID and the portid within the larb arbiter

 * from mtk_m4u_id which is defined by MTK_M4U_ID.

 */

#define MTK_M4U_TO_LARB(id)		(((id) >> 5) & 0xf)

#define MTK_M4U_TO_PORT(id)		((id) & 0x1f)



#define HAS_4GB_MODE			BIT(0)

/* HW will use the EMI clock if there isn't the "bclk". */

#define HAS_BCLK			BIT(1)

drivers/iommu/mtk_iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/spinlock.h>

#include <linux/dma-mapping.h>

#include <soc/mediatek/smi.h>

#include <dt-bindings/memory/mtk-memory-port.h>



#define MTK_LARB_COM_MAX	8

#define MTK_LARB_SUBCOM_MAX	4

drivers/memory/mtk-smi.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/pm_runtime.h>

#include <soc/mediatek/smi.h>

#include <dt-bindings/memory/mt2701-larb-port.h>

#include <dt-bindings/memory/mtk-memory-port.h>



/* mt8173 */

#define SMI_LARB_MMU_EN		0xf00

include/soc/mediatek/smi.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 


#ifdef CONFIG_MTK_SMI



#define MTK_LARB_NR_MAX		16



#define MTK_SMI_MMU_EN(port)	BIT(port)



struct mtk_smi_larb_iommu {