summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:05:31 -0500
committerJeff Kudrick <jeff.kudrick@freescale.com>2012-06-11 13:05:31 -0500
commit6ab35eebe70d1af98bb4c0fc30d99b350ff97146 (patch)
treeb8b7b28493f6b4f6f696b8045437ff79cc2d9a1a
parentdfab7be58bc1ae8910fe363c8ab78f63483cf613 (diff)
ENGR00211151: Cannot connect to Camera after start/stop Camcorder many timesimx-android-r14-beta
Aligned latest i.MX6 ICS 3.0.15 kernel to pick up latest media changes for Camera support. Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
-rwxr-xr-xarch/arm/mach-mx5/board-mx53_smd.c10
-rwxr-xr-xarch/arm/mach-mx5/devices-imx53.h4
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c
index 703949fba2d1..4753d6abbc98 100755
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/arch/arm/mach-mx5/board-mx53_smd.c
@@ -555,9 +555,17 @@ static struct fsl_mxc_camera_platform_data camera_data = {
.analog_regulator = "DA9052_LDO7",
.core_regulator = "DA9052_LDO9",
.mclk = 24000000,
+ .mclk_source = 0,
.csi = 0,
};
+static struct fsl_mxc_capture_platform_data capture_data = {
+ .csi = 0,
+ .ipu = 0,
+ .mclk_source = 0,
+ .is_mipi = 0,
+};
+
static struct fsl_mxc_lightsensor_platform_data ls_data = {
.rext = 700, /* calibration: 499K->700K */
};
@@ -1245,7 +1253,7 @@ static void __init mx53_smd_board_init(void)
imx53_add_vpu();
imx53_add_ldb(&ldb_data);
imx53_add_v4l2_output(0);
- imx53_add_v4l2_capture(0);
+ imx53_add_v4l2_capture(0, &capture_data);
imx53_add_mxc_pwm(1);
imx53_add_mxc_pwm_backlight(0, &mxc_pwm_backlight_data);
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h
index b8bf44f735a4..1694e29072d3 100755
--- a/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-mx5/devices-imx53.h
@@ -74,9 +74,9 @@ extern const struct imx_srtc_data imx53_imx_srtc_data __initconst;
platform_device_register_resndata(NULL, "mxc_v4l2_output",\
id, NULL, 0, NULL, 0);
-#define imx53_add_v4l2_capture(id) \
+#define imx53_add_v4l2_capture(id, pdata) \
platform_device_register_resndata(NULL, "mxc_v4l2_capture",\
- id, NULL, 0, NULL, 0);
+ id, NULL, 0, pdata, sizeof(*pdata));
extern const struct imx_ahci_data imx53_ahci_data[] __initconst;
#define imx53_add_ahci(id, pdata) \