aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2013-03-18 00:28:46 +0200
committerOhad Ben-Cohen <ohad@wizery.com>2013-03-18 00:28:46 +0200
commitb61f50a17c6bf8832938b2d3677eec66a5c5cca1 (patch)
tree968cdb0b48f0a58ff37ba82735946695cee37f5a
parenta4cc35e02ce78c548efb96eae7ba38f04b13cd5f (diff)
downloadremoteproc-3.9-rc2-hacky.tar.gz
tmp rproc dev adjustments3.9-rc2-hacky
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
-rw-r--r--arch/arm/mach-omap2/remoteproc.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/remoteproc.c b/arch/arm/mach-omap2/remoteproc.c
index a4a2e74e4ee5c7..c8fb662ce1e93e 100644
--- a/arch/arm/mach-omap2/remoteproc.c
+++ b/arch/arm/mach-omap2/remoteproc.c
@@ -58,14 +58,6 @@ static struct omap_iommu_arch_data omap4_rproc_iommu[] = {
{ .name = "mmu_ipu" },
};
-static struct omap_device_pm_latency omap_rproc_latency[] = {
- {
- .deactivate_func = omap_device_idle_hwmods,
- .activate_func = omap_device_enable_hwmods,
- .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- },
-};
-
static struct platform_device omap4_ducati = {
.name = "omap-rproc",
.id = 1, /* reserve 0 for tesla. we respect. */
@@ -126,16 +118,14 @@ static int __init omap_rproc_init(void)
}
omap4_rproc_data[i].device_enable = omap_device_enable;
- omap4_rproc_data[i].device_shutdown = omap_device_shutdown;
+ omap4_rproc_data[i].device_shutdown = omap_device_idle;
device_initialize(&pdev->dev);
/* Set dev_name early to allow dev_xxx in omap_device_alloc */
dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
- od = omap_device_alloc(pdev, oh, oh_count,
- omap_rproc_latency,
- ARRAY_SIZE(omap_rproc_latency));
+ od = omap_device_alloc(pdev, oh, oh_count);
if (!od) {
dev_err(&pdev->dev, "omap_device_alloc failed\n");
put_device(&pdev->dev);