summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/omap4iss/iss.h
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2016-02-21 13:25:11 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 12:33:25 -0300
commita288b78b83b6e795409de61dfb842faf5c4c53c3 (patch)
treee04ecd2ab437ef4d76ff6b195029df3f6601e330 /drivers/staging/media/omap4iss/iss.h
parent506a47eb4cab9706a9c007e22fadaae79c4cf491 (diff)
downloadlinux-a288b78b83b6e795409de61dfb842faf5c4c53c3.tar.gz
linux-a288b78b83b6e795409de61dfb842faf5c4c53c3.tar.bz2
linux-a288b78b83b6e795409de61dfb842faf5c4c53c3.zip
[media] staging: v4l: omap4iss: Use V4L2 graph PM operations
Power on devices represented by entities in the graph through the pipeline state using V4L2 graph PM operations instead of what was in the omap3isp driver. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss.h')
-rw-r--r--drivers/staging/media/omap4iss/iss.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index 05f08a3caa19..760ee27da704 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -15,6 +15,8 @@
#define _OMAP4_ISS_H_
#include <media/v4l2-device.h>
+#include <media/v4l2-mc.h>
+
#include <linux/device.h>
#include <linux/io.h>
#include <linux/platform_device.h>
@@ -87,7 +89,6 @@ struct iss_reg {
struct iss_device {
struct v4l2_device v4l2_dev;
struct media_device media_dev;
- struct media_entity_graph pm_count_graph;
struct device *dev;
u32 revision;
@@ -152,9 +153,6 @@ void omap4iss_isp_subclk_enable(struct iss_device *iss,
void omap4iss_isp_subclk_disable(struct iss_device *iss,
enum iss_isp_subclk_resource res);
-int omap4iss_pipeline_pm_use(struct media_entity *entity, int use,
- struct media_entity_graph *graph);
-
int omap4iss_register_entities(struct platform_device *pdev,
struct v4l2_device *v4l2_dev);
void omap4iss_unregister_entities(struct platform_device *pdev);