This patch explicitly enabled to "camif" clock, to make the driver work again with Qi commit a24b5fcf84d2cf633a3f660edd23fa4c2a3da231. Note that this is not fully tested since the Qi change also broke the LCM driver. Signed-off-by: Werner Almesberger --- ifIndex: cam/drivers/media/video/s3c_camera_driver.c =================================================================== --- cam.orig/drivers/media/video/s3c_camera_driver.c 2009-03-11 16:58:55.000000000 +0800 +++ cam/drivers/media/video/s3c_camera_driver.c 2009-03-11 17:03:50.000000000 +0800 @@ -1749,6 +1749,7 @@ { struct resource *res; camif_cfg_t *codec, *preview; + struct clk *camif_clock; /* Initialize fimc objects */ codec = s3c_camif_get_fimc_object(CODEC_MINOR); @@ -1795,6 +1796,14 @@ PHYS_OFFSET + (MEM_SIZE - RESERVED_MEM) + YUV_MEM; preview->pp_virt_buf = ioremap_nocache(preview->pp_phys_buf, RGB_MEM); + camif_clock = clk_get(&pdev->dev, "camif"); + if (IS_ERR(camif_clock)) { + dev_err(&pdev->dev, + "Failed to find camera interface clock source\n"); + return PTR_ERR(cam_clock); + } + clk_enable(camif_clock); + /* Device init */ s3c_camif_init(); s3c_camif_init_codec(codec); --