|
@@ -6,6 +6,7 @@
|
|
* This file is released under the GPLv2.
|
|
* This file is released under the GPLv2.
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
+#include <linux/delay.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/io.h>
|
|
#include <linux/io.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/platform_device.h>
|
|
@@ -19,6 +20,8 @@
|
|
#include <linux/suspend.h>
|
|
#include <linux/suspend.h>
|
|
#include <linux/export.h>
|
|
#include <linux/export.h>
|
|
|
|
|
|
|
|
+#define GENPD_RETRY_MAX_MS 250 /* Approximate */
|
|
|
|
+
|
|
#define GENPD_DEV_CALLBACK(genpd, type, callback, dev) \
|
|
#define GENPD_DEV_CALLBACK(genpd, type, callback, dev) \
|
|
({ \
|
|
({ \
|
|
type (*__routine)(struct device *__d); \
|
|
type (*__routine)(struct device *__d); \
|
|
@@ -2131,6 +2134,7 @@ EXPORT_SYMBOL_GPL(of_genpd_get_from_provider);
|
|
static void genpd_dev_pm_detach(struct device *dev, bool power_off)
|
|
static void genpd_dev_pm_detach(struct device *dev, bool power_off)
|
|
{
|
|
{
|
|
struct generic_pm_domain *pd;
|
|
struct generic_pm_domain *pd;
|
|
|
|
+ unsigned int i;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
pd = pm_genpd_lookup_dev(dev);
|
|
pd = pm_genpd_lookup_dev(dev);
|
|
@@ -2139,10 +2143,12 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)
|
|
|
|
|
|
dev_dbg(dev, "removing from PM domain %s\n", pd->name);
|
|
dev_dbg(dev, "removing from PM domain %s\n", pd->name);
|
|
|
|
|
|
- while (1) {
|
|
|
|
|
|
+ for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
|
|
ret = pm_genpd_remove_device(pd, dev);
|
|
ret = pm_genpd_remove_device(pd, dev);
|
|
if (ret != -EAGAIN)
|
|
if (ret != -EAGAIN)
|
|
break;
|
|
break;
|
|
|
|
+
|
|
|
|
+ mdelay(i);
|
|
cond_resched();
|
|
cond_resched();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2183,6 +2189,7 @@ int genpd_dev_pm_attach(struct device *dev)
|
|
{
|
|
{
|
|
struct of_phandle_args pd_args;
|
|
struct of_phandle_args pd_args;
|
|
struct generic_pm_domain *pd;
|
|
struct generic_pm_domain *pd;
|
|
|
|
+ unsigned int i;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
if (!dev->of_node)
|
|
if (!dev->of_node)
|
|
@@ -2218,10 +2225,12 @@ int genpd_dev_pm_attach(struct device *dev)
|
|
|
|
|
|
dev_dbg(dev, "adding to PM domain %s\n", pd->name);
|
|
dev_dbg(dev, "adding to PM domain %s\n", pd->name);
|
|
|
|
|
|
- while (1) {
|
|
|
|
|
|
+ for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
|
|
ret = pm_genpd_add_device(pd, dev);
|
|
ret = pm_genpd_add_device(pd, dev);
|
|
if (ret != -EAGAIN)
|
|
if (ret != -EAGAIN)
|
|
break;
|
|
break;
|
|
|
|
+
|
|
|
|
+ mdelay(i);
|
|
cond_resched();
|
|
cond_resched();
|
|
}
|
|
}
|
|
|
|
|