diff options
author | Even Xu <Feng.Xu@freescale.com> | 2011-11-28 14:29:32 +0800 |
---|---|---|
committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:18:18 +0800 |
commit | a6202d73e569e7030956f9d5b50ab2b6000eaf2c (patch) | |
tree | 91dcaca7d3a24db4f2e9517c9759af21ac5f2280 /drivers/mxc/mipi/mxc_mipi_csi2.h | |
parent | e783f50915dca45ebaf7ebe5ac70e8ccbcb01971 (diff) |
ENGR00163247-2 MX6Q: MIPI sensor add prp viewfinder and prp enc support
1. Enable ipu channel mipi setting
2. Change mipi csi2 driver common API to use lock
Signed-off-by: Even Xu <b21019@freescale.com>
Diffstat (limited to 'drivers/mxc/mipi/mxc_mipi_csi2.h')
-rw-r--r-- | drivers/mxc/mipi/mxc_mipi_csi2.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/mxc/mipi/mxc_mipi_csi2.h b/drivers/mxc/mipi/mxc_mipi_csi2.h index d7c4ba1e36da..9bccff7d6ce2 100644 --- a/drivers/mxc/mipi/mxc_mipi_csi2.h +++ b/drivers/mxc/mipi/mxc_mipi_csi2.h @@ -28,15 +28,18 @@ /* driver private data */ struct mipi_csi2_info { - int ipu_id; + bool mipi_en; + int ipu_id; unsigned int csi_id; unsigned int v_channel; unsigned int lanes; unsigned int datatype; - struct clk *dphy_clk; - struct clk *pixel_clk; - unsigned int *mipi_csi2_base; - struct platform_device *pdev; + struct clk *dphy_clk; + struct clk *pixel_clk; + unsigned int *mipi_csi2_base; + struct platform_device *pdev; + + struct mutex mutex_lock; }; #endif |