diff options
| author | Werner Almesberger <werner@openmoko.org> | 2009-03-11 11:25:23 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-11 11:25:23 +0000 |
| commit | b57f3ea7d30bf20320a491bece2405d13b349561 (patch) | |
| tree | e253cb514d52a4fdd856945a4fee0804ac8e5d89 /drivers/media | |
| parent | 921ada306538262acc10bc518b0fb07520f2403e (diff) | |
Enable camera interface clock
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 <werner@openmoko.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/s3c_camera_driver.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/s3c_camera_driver.c b/drivers/media/video/s3c_camera_driver.c index 3be273494d5..da376c4ee68 100644 --- a/drivers/media/video/s3c_camera_driver.c +++ b/drivers/media/video/s3c_camera_driver.c @@ -1749,6 +1749,7 @@ static int s3c_camif_probe(struct platform_device *pdev) { 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 @@ static int s3c_camif_probe(struct platform_device *pdev) 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); |