Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638080c3 authored by Kevin Hilman's avatar Kevin Hilman Committed by Rafael J. Wysocki
Browse files

OMAP2+ / PM: move runtime PM implementation to use device power domains 



In commit 7538e3db (PM: add support
for device power domains) a better way for handling platform-specific
power hooks was introduced.

Rather than using the platform_bus dev_pm_ops overrides
(platform_bus_set_pm_ops()), this patch moves the OMAP runtime PM
implementation over to using device power domains.

Since OMAP is the only user of platform_bus_set_pm_ops(), that
interface can be removed (and will be in a forthcoming patch.)

[rjw: Rebased on top of a previous change modifying the handling of
 power domains by the PM core so that power domain callbacks take
 precendence over subsystem-level PM callbacks.]

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 8b313a38

arch/arm/mach-omap2/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ endif 
# Power Management

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \

					   cpuidle34xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o pm_bus.o

					   cpuidle34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o

obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o

arch/arm/mach-omap2/pm_bus.c

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
/*

 * Runtime PM support code for OMAP

 *

 * Author: Kevin Hilman, Deep Root Systems, LLC

 *

 * Copyright (C) 2010 Texas Instruments, Inc.

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/io.h>

#include <linux/pm_runtime.h>

#include <linux/platform_device.h>

#include <linux/mutex.h>



#include <plat/omap_device.h>

#include <plat/omap-pm.h>



#ifdef CONFIG_PM_RUNTIME

static int omap_pm_runtime_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	int r, ret = 0;



	dev_dbg(dev, "%s\n", __func__);



	ret = pm_generic_runtime_suspend(dev);



	if (!ret && dev->parent == &omap_device_parent) {

		r = omap_device_idle(pdev);

		WARN_ON(r);

	}



	return ret;

};



static int omap_pm_runtime_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	int r;



	dev_dbg(dev, "%s\n", __func__);



	if (dev->parent == &omap_device_parent) {

		r = omap_device_enable(pdev);

		WARN_ON(r);

	}



	return pm_generic_runtime_resume(dev);

};

#else

#define omap_pm_runtime_suspend NULL

#define omap_pm_runtime_resume NULL

#endif /* CONFIG_PM_RUNTIME */



static int __init omap_pm_runtime_init(void)

{

	const struct dev_pm_ops *pm;

	struct dev_pm_ops *omap_pm;



	pm = platform_bus_get_pm_ops();

	if (!pm) {

		pr_err("%s: unable to get dev_pm_ops from platform_bus\n",

			__func__);

		return -ENODEV;

	}



	omap_pm = kmemdup(pm, sizeof(struct dev_pm_ops), GFP_KERNEL);

	if (!omap_pm) {

		pr_err("%s: unable to alloc memory for new dev_pm_ops\n",

			__func__);

		return -ENOMEM;

	}



	omap_pm->runtime_suspend = omap_pm_runtime_suspend;

	omap_pm->runtime_resume = omap_pm_runtime_resume;



	platform_bus_set_pm_ops(omap_pm);



	return 0;

}

core_initcall(omap_pm_runtime_init);

arch/arm/plat-omap/omap_device.c

+23 −0
Original line number Diff line number Diff line
@@ -536,6 +536,28 @@ int omap_early_device_register(struct omap_device *od) 
	return 0;

}



static int _od_runtime_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);



	return omap_device_idle(pdev);

}



static int _od_runtime_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);



	return omap_device_enable(pdev);

}



static struct dev_power_domain omap_device_power_domain = {

	.ops = {

		.runtime_suspend = _od_runtime_suspend,

		.runtime_resume = _od_runtime_resume,

		USE_PLATFORM_PM_SLEEP_OPS

	}

};



/**

 * omap_device_register - register an omap_device with one omap_hwmod

 * @od: struct omap_device * to register
@@ -549,6 +571,7 @@ int omap_device_register(struct omap_device *od) 
	pr_debug("omap_device: %s: registering\n", od->pdev.name);



	od->pdev.dev.parent = &omap_device_parent;

	od->pdev.dev.pwr_domain = &omap_device_power_domain;

	return platform_device_register(&od->pdev);

}