diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-12-13 19:37:09 -0500 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-01-16 11:03:05 -0500 |
commit | 78e1f974dd351ac82d978e3aac2d27422013f914 (patch) | |
tree | b9951af7dea9f02a2b49f874c7cc0356f6405ebc /drivers/iommu | |
parent | a166d31ee56e8fc56ce2497d8de9da5359f4ee41 (diff) |
iommu/ipmmu-vmsa: Remove platform data support
No board file instantiates the IPMMU using platform data. Now that we
have DT support, get rid of platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 5d080cf11ba5..791c3daec7c0 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/iommu.h> | 17 | #include <linux/iommu.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/platform_data/ipmmu-vmsa.h> | ||
21 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
22 | #include <linux/sizes.h> | 21 | #include <linux/sizes.h> |
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
@@ -30,7 +29,6 @@ struct ipmmu_vmsa_device { | |||
30 | void __iomem *base; | 29 | void __iomem *base; |
31 | struct list_head list; | 30 | struct list_head list; |
32 | 31 | ||
33 | const struct ipmmu_vmsa_platform_data *pdata; | ||
34 | unsigned int num_utlbs; | 32 | unsigned int num_utlbs; |
35 | 33 | ||
36 | struct dma_iommu_mapping *mapping; | 34 | struct dma_iommu_mapping *mapping; |
@@ -1015,27 +1013,6 @@ static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev, | |||
1015 | unsigned int i; | 1013 | unsigned int i; |
1016 | int count; | 1014 | int count; |
1017 | 1015 | ||
1018 | if (mmu->pdata) { | ||
1019 | const struct ipmmu_vmsa_master *master = mmu->pdata->masters; | ||
1020 | const char *devname = dev_name(dev); | ||
1021 | unsigned int i; | ||
1022 | |||
1023 | for (i = 0; i < mmu->pdata->num_masters; ++i, ++master) { | ||
1024 | if (strcmp(master->name, devname) == 0) { | ||
1025 | utlbs = kmalloc(sizeof(*utlbs), GFP_KERNEL); | ||
1026 | if (!utlbs) | ||
1027 | return -ENOMEM; | ||
1028 | |||
1029 | utlbs[0] = master->utlb; | ||
1030 | |||
1031 | *_utlbs = utlbs; | ||
1032 | return 1; | ||
1033 | } | ||
1034 | } | ||
1035 | |||
1036 | return -EINVAL; | ||
1037 | } | ||
1038 | |||
1039 | count = of_count_phandle_with_args(dev->of_node, "iommus", | 1016 | count = of_count_phandle_with_args(dev->of_node, "iommus", |
1040 | "#iommu-cells"); | 1017 | "#iommu-cells"); |
1041 | if (count < 0) | 1018 | if (count < 0) |
@@ -1246,7 +1223,6 @@ static int ipmmu_probe(struct platform_device *pdev) | |||
1246 | } | 1223 | } |
1247 | 1224 | ||
1248 | mmu->dev = &pdev->dev; | 1225 | mmu->dev = &pdev->dev; |
1249 | mmu->pdata = pdev->dev.platform_data; | ||
1250 | mmu->num_utlbs = 32; | 1226 | mmu->num_utlbs = 32; |
1251 | 1227 | ||
1252 | /* Map I/O memory and request IRQ. */ | 1228 | /* Map I/O memory and request IRQ. */ |