ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-9-yong.wu@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Yong Wu
2021-01-11 19:18:49 +08:00
committed by Will Deacon
parent fc3734698a
commit 66a2891554
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iommu/mtk_iommu.c
View File

@@ -103,13 +103,6 @@
#define MTK_PROTECT_PA_ALIGN 256 #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) #define HAS_4GB_MODE BIT(0)
/* HW will use the EMI clock if there isn't the "bclk". */ /* HW will use the EMI clock if there isn't the "bclk". */
#define HAS_BCLK BIT(1) #define HAS_BCLK BIT(1)

1
drivers/iommu/mtk_iommu.h
View File

@@ -17,6 +17,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <soc/mediatek/smi.h> #include <soc/mediatek/smi.h>
#include <dt-bindings/memory/mtk-memory-port.h>
#define MTK_LARB_COM_MAX 8 #define MTK_LARB_COM_MAX 8
#define MTK_LARB_SUBCOM_MAX 4 #define MTK_LARB_SUBCOM_MAX 4

1
drivers/memory/mtk-smi.c
View File

@@ -15,6 +15,7 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <soc/mediatek/smi.h> #include <soc/mediatek/smi.h>
#include <dt-bindings/memory/mt2701-larb-port.h> #include <dt-bindings/memory/mt2701-larb-port.h>
#include <dt-bindings/memory/mtk-memory-port.h>
/* mt8173 */ /* mt8173 */
#define SMI_LARB_MMU_EN 0xf00 #define SMI_LARB_MMU_EN 0xf00

2
include/soc/mediatek/smi.h
View File

@@ -11,8 +11,6 @@
#ifdef CONFIG_MTK_SMI #ifdef CONFIG_MTK_SMI
#define MTK_LARB_NR_MAX 16
#define MTK_SMI_MMU_EN(port) BIT(port) #define MTK_SMI_MMU_EN(port) BIT(port)
struct mtk_smi_larb_iommu { struct mtk_smi_larb_iommu {