diff options
author | Honghui Zhang <honghui.zhang@mediatek.com> | 2016-06-08 05:50:58 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2016-06-21 05:36:19 -0400 |
commit | 9ca340c98c0dc6cb60b5ebd7847302f57648f0ba (patch) | |
tree | 0ad4bb2df4a2efb9c0c804b580b76972cf4d9714 /drivers/iommu/mtk_iommu.c | |
parent | 7e42626ad3f4540143e68ba41e5e553f2715b451 (diff) |
iommu/mediatek: move the common struct into header file
Move the struct defines of mtk iommu into a new header files for
common use.
Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/mtk_iommu.c')
-rw-r--r-- | drivers/iommu/mtk_iommu.c | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 493bd3e0f8db..b12c12d74c33 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <dt-bindings/memory/mt8173-larb-port.h> | 34 | #include <dt-bindings/memory/mt8173-larb-port.h> |
35 | #include <soc/mediatek/smi.h> | 35 | #include <soc/mediatek/smi.h> |
36 | 36 | ||
37 | #include "io-pgtable.h" | 37 | #include "mtk_iommu.h" |
38 | 38 | ||
39 | #define REG_MMU_PT_BASE_ADDR 0x000 | 39 | #define REG_MMU_PT_BASE_ADDR 0x000 |
40 | 40 | ||
@@ -93,20 +93,6 @@ | |||
93 | 93 | ||
94 | #define MTK_PROTECT_PA_ALIGN 128 | 94 | #define MTK_PROTECT_PA_ALIGN 128 |
95 | 95 | ||
96 | struct mtk_iommu_suspend_reg { | ||
97 | u32 standard_axi_mode; | ||
98 | u32 dcm_dis; | ||
99 | u32 ctrl_reg; | ||
100 | u32 int_control0; | ||
101 | u32 int_main_control; | ||
102 | }; | ||
103 | |||
104 | struct mtk_iommu_client_priv { | ||
105 | struct list_head client; | ||
106 | unsigned int mtk_m4u_id; | ||
107 | struct device *m4udev; | ||
108 | }; | ||
109 | |||
110 | struct mtk_iommu_domain { | 96 | struct mtk_iommu_domain { |
111 | spinlock_t pgtlock; /* lock for page table */ | 97 | spinlock_t pgtlock; /* lock for page table */ |
112 | 98 | ||
@@ -116,19 +102,6 @@ struct mtk_iommu_domain { | |||
116 | struct iommu_domain domain; | 102 | struct iommu_domain domain; |
117 | }; | 103 | }; |
118 | 104 | ||
119 | struct mtk_iommu_data { | ||
120 | void __iomem *base; | ||
121 | int irq; | ||
122 | struct device *dev; | ||
123 | struct clk *bclk; | ||
124 | phys_addr_t protect_base; /* protect memory base */ | ||
125 | struct mtk_iommu_suspend_reg reg; | ||
126 | struct mtk_iommu_domain *m4u_dom; | ||
127 | struct iommu_group *m4u_group; | ||
128 | struct mtk_smi_iommu smi_imu; /* SMI larb iommu info */ | ||
129 | bool enable_4GB; | ||
130 | }; | ||
131 | |||
132 | static struct iommu_ops mtk_iommu_ops; | 105 | static struct iommu_ops mtk_iommu_ops; |
133 | 106 | ||
134 | static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) | 107 | static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) |
@@ -551,25 +524,6 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) | |||
551 | return 0; | 524 | return 0; |
552 | } | 525 | } |
553 | 526 | ||
554 | static int compare_of(struct device *dev, void *data) | ||
555 | { | ||
556 | return dev->of_node == data; | ||
557 | } | ||
558 | |||
559 | static int mtk_iommu_bind(struct device *dev) | ||
560 | { | ||
561 | struct mtk_iommu_data *data = dev_get_drvdata(dev); | ||
562 | |||
563 | return component_bind_all(dev, &data->smi_imu); | ||
564 | } | ||
565 | |||
566 | static void mtk_iommu_unbind(struct device *dev) | ||
567 | { | ||
568 | struct mtk_iommu_data *data = dev_get_drvdata(dev); | ||
569 | |||
570 | component_unbind_all(dev, &data->smi_imu); | ||
571 | } | ||
572 | |||
573 | static const struct component_master_ops mtk_iommu_com_ops = { | 527 | static const struct component_master_ops mtk_iommu_com_ops = { |
574 | .bind = mtk_iommu_bind, | 528 | .bind = mtk_iommu_bind, |
575 | .unbind = mtk_iommu_unbind, | 529 | .unbind = mtk_iommu_unbind, |