diff options
| author | Joerg Roedel <jroedel@suse.de> | 2021-02-02 13:35:40 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2021-02-02 13:35:40 +0100 |
| commit | d1e3306ba83a839462d239ab6dff45ec10f8ce2b (patch) | |
| tree | 9f4a9be46aec7d321a377429aed3bed726390598 /include/soc | |
| parent | 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 (diff) | |
| parent | 7060377ce06f9cd3ed6274c0f2310463feb5baec (diff) | |
| download | linux-stable-d1e3306ba83a839462d239ab6dff45ec10f8ce2b.tar.gz linux-stable-d1e3306ba83a839462d239ab6dff45ec10f8ce2b.tar.bz2 linux-stable-d1e3306ba83a839462d239ab6dff45ec10f8ce2b.zip | |
Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Arm SMMU updates for 5.12
- Support for MT8192 IOMMU from Mediatek
- Arm v7s io-pgtable extensions for MT8192
- Removal of TLBI_ON_MAP quirk
- New Qualcomm compatible strings
- Allow SVA without hardware broadcast TLB maintenance on SMMUv3
- Virtualization Host Extension support for SMMUv3 (SVA)
- Allow SMMUv3 PMU (perf) driver to be built independently from IOMMU
- Misc cleanups
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/mediatek/smi.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h index 5a34b87d89e3..4cf445dbbdaa 100644 --- a/include/soc/mediatek/smi.h +++ b/include/soc/mediatek/smi.h @@ -11,13 +11,12 @@ #ifdef CONFIG_MTK_SMI -#define MTK_LARB_NR_MAX 16 - #define MTK_SMI_MMU_EN(port) BIT(port) struct mtk_smi_larb_iommu { struct device *dev; unsigned int mmu; + unsigned char bank[32]; }; /* |