diff options
| author | Charlie Huang <chahuang@nvidia.com> | 2014-01-22 11:40:56 -0800 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2014-02-02 22:55:47 -0800 |
| commit | 6e8d44e65980de85e0137794f9315b3bdcf1c7fc (patch) | |
| tree | b64be4ac997bc8ce55dbd82b8ce7f20cc9059209 /include/media | |
| parent | 2395f8ba540de85fa7344a926fe6fc52d1d58194 (diff) | |
drivers: media: platform: tegra: remove edp client
a new edp framework has been impemented, so the old edp supports
need to be removed.
support for new framework will be implemeted next.
bug 1431977
Change-Id: I78957a3b2979919b9222e0c2b26426b2c2431bb6
Signed-off-by: Charlie Huang <chahuang@nvidia.com>
Reviewed-on: http://git-master/r/358837
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/camera.h | 13 | ||||
| -rw-r--r-- | include/media/imx179.h | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/include/media/camera.h b/include/media/camera.h index 9b2cb5337306..6727c8e803e8 100644 --- a/include/media/camera.h +++ b/include/media/camera.h @@ -22,7 +22,7 @@ #include <linux/miscdevice.h> #include <linux/i2c.h> #include <linux/regmap.h> -#include <linux/edp.h> +#include <linux/sysedp.h> #include <media/nvc.h> #endif @@ -77,6 +77,7 @@ #define CAMERA_SEQ_INDEX_MASK 0x0000ffff #define CAMERA_SEQ_FLAG_MASK (~CAMERA_SEQ_INDEX_MASK) #define CAMERA_SEQ_FLAG_EDP 0x80000000 + enum { CAMERA_SEQ_EXEC, CAMERA_SEQ_REGISTER_EXEC, @@ -119,8 +120,6 @@ struct gpio_cfg { struct edp_cfg { uint estates[CAMERA_MAX_EDP_ENTRIES]; uint num; - uint e0_index; - int priority; }; #define VIRTUAL_DEV_MAX_REGULATORS 8 @@ -206,11 +205,10 @@ struct camera_platform_data { }; struct camera_edp_cfg { - struct edp_client edp_client; + struct sysedp_consumer *edp_client; unsigned edp_state; - u8 edpc_en; - struct camera_reg *s_throttle; - int (*shutdown)(struct camera_device *cdev); + uint estates[CAMERA_MAX_EDP_ENTRIES]; + uint num; }; struct camera_seq_status { @@ -228,7 +226,6 @@ struct camera_device { struct camera_info *cam; atomic_t in_use; struct mutex mutex; - uint estates[CAMERA_MAX_EDP_ENTRIES]; struct camera_edp_cfg edpc; struct clk **clks; u32 num_clk; diff --git a/include/media/imx179.h b/include/media/imx179.h index cc6bfd32de02..c26a76977854 100644 --- a/include/media/imx179.h +++ b/include/media/imx179.h @@ -18,7 +18,6 @@ #define __IMX179_H__ #include <linux/ioctl.h> /* For IOCTL macros */ -#include <linux/edp.h> #include <media/nvc.h> #include <media/nvc_image.h> @@ -77,7 +76,6 @@ struct imx179_power_rail { struct imx179_platform_data { struct imx179_flash_control flash_cap; const char *mclk_name; /* NULL for default default_mclk */ - struct edp_client edpc_config; unsigned int cam1_gpio; unsigned int reset_gpio; unsigned int af_gpio; |