Hi Dave, Could you please pick this patch up ? On Monday 28 October 2013 23:49:22 Laurent Pinchart wrote: > Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and > clk_disable_unprepare() to get ready for the migration to the common > clock framework. > > Cc: David Airlie <airlied@xxxxxxxx> > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 54bad98..562f9a4 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > @@ -40,7 +40,7 @@ > static void shmob_drm_clk_on(struct shmob_drm_device *sdev) > { > if (sdev->clock) > - clk_enable(sdev->clock); > + clk_prepare_enable(sdev->clock); > #if 0 > if (sdev->meram_dev && sdev->meram_dev->pdev) > pm_runtime_get_sync(&sdev->meram_dev->pdev->dev); > @@ -54,7 +54,7 @@ static void shmob_drm_clk_off(struct shmob_drm_device > *sdev) pm_runtime_put_sync(&sdev->meram_dev->pdev->dev); > #endif > if (sdev->clock) > - clk_disable(sdev->clock); > + clk_disable_unprepare(sdev->clock); > } > > /* > --------------------------------------------------------------------------- -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel