| Message ID | Pine.LNX.4.64.0904021145040.5263@axis700.grange (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On Thu, Apr 02, 2009 at 11:49:55AM +0200, Guennadi Liakhovetski wrote: > With the i.MX31 transition to clkdev clock names have changed, fix the > driver to use the new name. > > Signed-off-by: Guennadi Liakhovetski <lg@denx.de> > --- > diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c > index 70629e1..7e6b51d 100644 > --- a/drivers/media/video/mx3_camera.c > +++ b/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, "csi"); clk_get(&pdev->dev, NULL) please. The name is only for distinguishing the clocks when there is more than one clock per device which isn't the case here. I just see that it's _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) Should be _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) instead. Sascha
On Fri, 3 Apr 2009, Sascha Hauer wrote: > On Thu, Apr 02, 2009 at 11:49:55AM +0200, Guennadi Liakhovetski wrote: > > With the i.MX31 transition to clkdev clock names have changed, fix the > > driver to use the new name. > > > > Signed-off-by: Guennadi Liakhovetski <lg@denx.de> > > --- > > diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c > > index 70629e1..7e6b51d 100644 > > --- a/drivers/media/video/mx3_camera.c > > +++ b/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, "csi"); > > clk_get(&pdev->dev, NULL) please. The name is only for distinguishing > the clocks when there is more than one clock per device which isn't the > case here. > > I just see that it's > > _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) > > Should be > > _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) > > instead. Right, that's why. What should we do now? 1. We leave this patch as is, and remove the connection ID later 2. I make a single patch that changes both, you ack it, and I pull it via V4L. 3. I make two patches, you ack the ARM part and I pull them via V$L. 4. We do not want to pull two patches via different trees Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Apr 03, 2009 at 10:49:32AM +0200, Guennadi Liakhovetski wrote: > On Fri, 3 Apr 2009, Sascha Hauer wrote: > > > On Thu, Apr 02, 2009 at 11:49:55AM +0200, Guennadi Liakhovetski wrote: > > > With the i.MX31 transition to clkdev clock names have changed, fix the > > > driver to use the new name. > > > > > > Signed-off-by: Guennadi Liakhovetski <lg@denx.de> > > > --- > > > diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c > > > index 70629e1..7e6b51d 100644 > > > --- a/drivers/media/video/mx3_camera.c > > > +++ b/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, "csi"); > > > > clk_get(&pdev->dev, NULL) please. The name is only for distinguishing > > the clocks when there is more than one clock per device which isn't the > > case here. > > > > I just see that it's > > > > _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) > > > > Should be > > > > _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) > > > > instead. > > Right, that's why. What should we do now? > > 1. We leave this patch as is, and remove the connection ID later > 2. I make a single patch that changes both, you ack it, and I pull it via > V4L. > 3. I make two patches, you ack the ARM part and I pull them via V$L. > 4. We do not want to pull two patches via different trees 2) is ok for me. Sascha
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 70629e1..7e6b51d 100644 --- a/drivers/media/video/mx3_camera.c +++ b/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, "csi"); if (IS_ERR(mx3_cam->clk)) { err = PTR_ERR(mx3_cam->clk); goto eclkget;
With the i.MX31 transition to clkdev clock names have changed, fix the driver to use the new name. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html