summaryrefslogtreecommitdiff
path: root/include/linux/fsl_devices.h
diff options
context:
space:
mode:
authorJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:02:40 -0500
committerJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:02:40 -0500
commitdfab7be58bc1ae8910fe363c8ab78f63483cf613 (patch)
tree6e6670d84fa96d724defbd1d15b0f885ad60a7c3 /include/linux/fsl_devices.h
parent569dc9187a890c0b04779df0af882df69fd093aa (diff)
ENGR00211151: Cannot connect to Camera after start/stop Camcorder many times
Aligned latest i.MX6 ICS 3.0.15 kernel changes for media processing and Camera support. Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
Diffstat (limited to 'include/linux/fsl_devices.h')
-rw-r--r--include/linux/fsl_devices.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index bec8fe9cd838..1dcea253f651 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -280,12 +280,20 @@ struct fsl_mxc_hdmi_core_platform_data {
int disp_id;
};
+struct fsl_mxc_capture_platform_data {
+ int csi;
+ int ipu;
+ u8 mclk_source;
+ u8 is_mipi;
+};
+
struct fsl_mxc_camera_platform_data {
char *core_regulator;
char *io_regulator;
char *analog_regulator;
char *gpo_regulator;
u32 mclk;
+ u8 mclk_source;
u32 csi;
void (*pwdn)(int pwdn);
void (*io_init)(void);