diff options
| author | Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de> | 2008-08-14 17:04:11 +0200 |
|---|---|---|
| committer | Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de> | 2008-08-14 17:04:11 +0200 |
| commit | 6413c9eb617e2eebe283211c0422e46bbd7289bb (patch) | |
| tree | 8aeda4e770081e8bdaed0d5618fd7837ce0b094b /linux/include/media | |
| parent | 4da232f764389ccafbe28832bf57aeae316d465f (diff) | |
| download | mediapointer-dvb-s2-6413c9eb617e2eebe283211c0422e46bbd7289bb.tar.gz mediapointer-dvb-s2-6413c9eb617e2eebe283211c0422e46bbd7289bb.tar.bz2 | |
soc-camera: Move .power and .reset from soc_camera host to sensor driver
Make .power and .reset callbacks per camera instead of per host, also move
their invocation to camera drivers.
Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 33 +++++++++++++++++++++++++--
drivers/media/video/mt9m111.c | 15 ++++++++++++
drivers/media/video/mt9v022.c | 24 +++++++++++++++++++-
drivers/media/video/pxa_camera.c | 24 --------------------
drivers/media/video/sh_mobile_ceu_camera.c | 5 ----
include/asm-arm/arch-pxa/camera.h | 2 -
include/media/sh_mobile_ceu.h | 2 -
include/media/soc_camera.h | 3 ++
8 files changed, 71 insertions(+), 37 deletions(-)
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/sh_mobile_ceu.h | 2 | ||||
| -rw-r--r-- | linux/include/media/soc_camera.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/include/media/sh_mobile_ceu.h b/linux/include/media/sh_mobile_ceu.h index 234a4711d..b5dbefea3 100644 --- a/linux/include/media/sh_mobile_ceu.h +++ b/linux/include/media/sh_mobile_ceu.h @@ -5,8 +5,6 @@ struct sh_mobile_ceu_info { unsigned long flags; /* SOCAM_... */ - void (*enable_camera)(void); - void (*disable_camera)(void); }; #endif /* __ASM_SH_MOBILE_CEU_H__ */ diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index d548de326..c5de7bb19 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -83,6 +83,9 @@ struct soc_camera_link { int bus_id; /* GPIO number to switch between 8 and 10 bit modes */ unsigned int gpio; + /* Optional callbacks to power on or off and reset the sensor */ + int (*power)(struct device *, int); + int (*reset)(struct device *); }; static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev) |