Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71df97a authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

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: default avatarGuennadi Liakhovetski <lg@denx.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f9826514

arch/arm/mach-mx3/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/media/video/mx3_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -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;