From: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
---
drivers/media/video/s5p-fimc/fimc-core.c | 15 +++++++++++++++
drivers/media/video/s5p-fimc/mipi-csis.c | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index 30c6365..15c7cc6 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -19,6 +19,7 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
#include <linux/list.h>
#include <linux/io.h>
#include <linux/of.h>
@@ -1057,6 +1058,17 @@ static int fimc_m2m_resume(struct fimc_dev *fimc)
return 0;
}
+static void bus_add_dev_to_pd(struct device *dev)
+{
+ struct device_node *np;
+
+ np = of_parse_phandle(dev->of_node, "pd", 0);
+ if (np)
+ pm_genpd_of_add_device(np, dev);
+
+ of_node_put(np);
+}
+
static int fimc_probe(struct platform_device *pdev)
{
struct fimc_drvdata *drv_data = NULL;
@@ -1072,6 +1084,9 @@ static int fimc_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
u32 id = 0;
+
+ bus_add_dev_to_pd(&pdev->dev);
+
of_id = of_match_node(fimc_of_match, pdev->dev.of_node);
if (of_id)
drv_data = of_id->data;
diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c b/drivers/media/video/s5p-fimc/mipi-csis.c
index ffb820e..6858c92 100644
--- a/drivers/media/video/s5p-fimc/mipi-csis.c
+++ b/drivers/media/video/s5p-fimc/mipi-csis.c
@@ -22,6 +22,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
@@ -529,6 +530,17 @@ static int s5pcsis_get_platform_data(struct platform_device *pdev,
return 0;
}
+static void bus_add_dev_to_pd(struct device *dev)
+{
+ struct device_node *np;
+
+ np = of_parse_phandle(dev->of_node, "pd", 0);
+ if (np)
+ pm_genpd_of_add_device(np, dev);
+
+ of_node_put(np);
+}
+
static int __devinit s5pcsis_probe(struct platform_device *pdev)
{
struct resource *mem_res;
@@ -543,6 +555,9 @@ static int __devinit s5pcsis_probe(struct platform_device *pdev)
mutex_init(&state->lock);
state->pdev = pdev;
+ if (pdev->dev.of_node)
+ bus_add_dev_to_pd(&pdev->dev);
+
ret = s5pcsis_get_platform_data(pdev, state);
if (ret < 0)
return ret;
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
