diff options
author | Guennadi Liakhovetski <lg@denx.de> | 2009-04-03 09:34:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:43:58 -0400 |
commit | b71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88 (patch) | |
tree | e16c24632215a9d5a5e28ffc64394dae4b297367 /arch/arm/mach-mx3 | |
parent | f982651410f00378e42d9daab274adee5c762523 (diff) |
V4L/DVB (11349): mx3-camera: adapt the clock definition and the driver to the new clock naming
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r-- | arch/arm/mach-mx3/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index ca46f4801c3d..9957a11533a4 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c | |||
@@ -533,7 +533,7 @@ static struct clk_lookup lookups[] __initdata = { | |||
533 | _REGISTER_CLOCK(NULL, "kpp", kpp_clk) | 533 | _REGISTER_CLOCK(NULL, "kpp", kpp_clk) |
534 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) | 534 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) |
535 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) | 535 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) |
536 | _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) | 536 | _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) |
537 | _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) | 537 | _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) |
538 | _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) | 538 | _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) |
539 | _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) | 539 | _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) |