|
@@ -314,8 +314,6 @@ static void _add_hwmod_clocks_clkdev(struct omap_device *od,
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-static struct dev_pm_domain omap_device_pm_domain;
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* omap_device_build_from_dt - build an omap_device with multiple hwmods
|
|
* omap_device_build_from_dt - build an omap_device with multiple hwmods
|
|
* @pdev_name: name of the platform_device driver to use
|
|
* @pdev_name: name of the platform_device driver to use
|
|
@@ -793,7 +791,7 @@ static int _od_resume_noirq(struct device *dev)
|
|
#define _od_resume_noirq NULL
|
|
#define _od_resume_noirq NULL
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-static struct dev_pm_domain omap_device_pm_domain = {
|
|
|
|
|
|
+struct dev_pm_domain omap_device_pm_domain = {
|
|
.ops = {
|
|
.ops = {
|
|
SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
|
|
SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
|
|
_od_runtime_idle)
|
|
_od_runtime_idle)
|
|
@@ -815,7 +813,6 @@ int omap_device_register(struct platform_device *pdev)
|
|
{
|
|
{
|
|
pr_debug("omap_device: %s: registering\n", pdev->name);
|
|
pr_debug("omap_device: %s: registering\n", pdev->name);
|
|
|
|
|
|
- pdev->dev.parent = &omap_device_parent;
|
|
|
|
pdev->dev.pm_domain = &omap_device_pm_domain;
|
|
pdev->dev.pm_domain = &omap_device_pm_domain;
|
|
return platform_device_add(pdev);
|
|
return platform_device_add(pdev);
|
|
}
|
|
}
|
|
@@ -1124,11 +1121,6 @@ int omap_device_enable_clocks(struct omap_device *od)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-struct device omap_device_parent = {
|
|
|
|
- .init_name = "omap",
|
|
|
|
- .parent = &platform_bus,
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
static struct notifier_block platform_nb = {
|
|
static struct notifier_block platform_nb = {
|
|
.notifier_call = _omap_device_notifier_call,
|
|
.notifier_call = _omap_device_notifier_call,
|
|
};
|
|
};
|
|
@@ -1136,6 +1128,6 @@ static struct notifier_block platform_nb = {
|
|
static int __init omap_device_init(void)
|
|
static int __init omap_device_init(void)
|
|
{
|
|
{
|
|
bus_register_notifier(&platform_bus_type, &platform_nb);
|
|
bus_register_notifier(&platform_bus_type, &platform_nb);
|
|
- return device_register(&omap_device_parent);
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
core_initcall(omap_device_init);
|
|
core_initcall(omap_device_init);
|