openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Laurent Pinchart 2014-12-14 02:37:09 +02:00
parent a166d31ee5
commit 78e1f974dd
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iommu/ipmmu-vmsa.c
View File

@ -17,7 +17,6 @@
#include <linux/iommu.h> #include <linux/iommu.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_data/ipmmu-vmsa.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -30,7 +29,6 @@ struct ipmmu_vmsa_device {
void __iomem *base; void __iomem *base;
struct list_head list; struct list_head list;
const struct ipmmu_vmsa_platform_data *pdata;
unsigned int num_utlbs; unsigned int num_utlbs;
struct dma_iommu_mapping *mapping; struct dma_iommu_mapping *mapping;
@ -1015,27 +1013,6 @@ static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
unsigned int i; unsigned int i;
int count; int count;
if (mmu->pdata) {
const struct ipmmu_vmsa_master *master = mmu->pdata->masters;
const char *devname = dev_name(dev);
unsigned int i;
for (i = 0; i < mmu->pdata->num_masters; ++i, ++master) {
if (strcmp(master->name, devname) == 0) {
utlbs = kmalloc(sizeof(*utlbs), GFP_KERNEL);
if (!utlbs)
return -ENOMEM;
utlbs[0] = master->utlb;
*_utlbs = utlbs;
return 1;
}
}
return -EINVAL;
}
count = of_count_phandle_with_args(dev->of_node, "iommus", count = of_count_phandle_with_args(dev->of_node, "iommus",
"#iommu-cells"); "#iommu-cells");
if (count < 0) if (count < 0)
@ -1246,7 +1223,6 @@ static int ipmmu_probe(struct platform_device *pdev)
} }
mmu->dev = &pdev->dev; mmu->dev = &pdev->dev;
mmu->pdata = pdev->dev.platform_data;
mmu->num_utlbs = 32; mmu->num_utlbs = 32;
/* Map I/O memory and request IRQ. */ /* Map I/O memory and request IRQ. */

24
include/linux/platform_data/ipmmu-vmsa.h
View File

@ -1,24 +0,0 @@
/*
* IPMMU VMSA Platform Data
*
* Copyright (C) 2014 Renesas Electronics Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*/
#ifndef __IPMMU_VMSA_H__
#define __IPMMU_VMSA_H__
struct ipmmu_vmsa_master {
const char *name;
unsigned int utlb;
};
struct ipmmu_vmsa_platform_data {
const struct ipmmu_vmsa_master *masters;
unsigned int num_masters;
};
#endif /* __IPMMU_VMSA_H__ */