diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-03 15:34:02 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-03 15:34:02 +0200 |
| commit | 88c3b5d5fa67f017ba19a29c6ef2a28cbc492b90 (patch) | |
| tree | 3c9e9d487a04db8e4d3c40f66ce745c670c8884e /linux | |
| parent | 585e1cd09eb5a13991d907832b853e4c1fd7411b (diff) | |
| download | mediapointer-dvb-s2-88c3b5d5fa67f017ba19a29c6ef2a28cbc492b90.tar.gz mediapointer-dvb-s2-88c3b5d5fa67f017ba19a29c6ef2a28cbc492b90.tar.bz2 | |
mx3-camera: adapt the clock definition and the driver to the new clock naming
From: Guennadi Liakhovetski <lg@denx.de>
With the i.MX31 transition to clkdev clock names have changed, but mistakenly
the "mx3-camera.0" has been registered with a non-NULL connection ID, which is
not necessary, since this is the only clock, used by the capture interface
driver. Fix the clock definition and the driver to use NULL as a connection ID.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-mx3/clock.c | 2 +-
drivers/media/video/mx3_camera.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/arch/arm/mach-mx3/clock.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/mx3_camera.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/arch/arm/mach-mx3/clock.c b/linux/arch/arm/mach-mx3/clock.c index ca46f4801..9957a1153 100644 --- a/linux/arch/arm/mach-mx3/clock.c +++ b/linux/arch/arm/mach-mx3/clock.c @@ -533,7 +533,7 @@ static struct clk_lookup lookups[] __initdata = { _REGISTER_CLOCK(NULL, "kpp", kpp_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) - _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) + _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) diff --git a/linux/drivers/media/video/mx3_camera.c b/linux/drivers/media/video/mx3_camera.c index 70629e172..c462b811e 100644 --- a/linux/drivers/media/video/mx3_camera.c +++ b/linux/drivers/media/video/mx3_camera.c @@ -1100,7 +1100,7 @@ static int mx3_camera_probe(struct platform_device *pdev) } memset(mx3_cam, 0, sizeof(*mx3_cam)); - mx3_cam->clk = clk_get(&pdev->dev, "csi_clk"); + mx3_cam->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(mx3_cam->clk)) { err = PTR_ERR(mx3_cam->clk); goto eclkget; |