From: Gerhard Sittig Date: Sat, 30 Nov 2013 22:51:33 +0000 (+0100) Subject: upstream: fsl-viu: adjust for OF based clock lookup X-Git-Tag: submit/tizen/20141121.110247~1524 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ea28cd1bfec48a136cb5d8cd3777da164fc19a8;p=platform%2Fkernel%2Flinux-3.10.git upstream: fsl-viu: adjust for OF based clock lookup after device tree based clock lookup became available, the VIU driver need no longer use the previous global "viu_clk" name, but should use the "ipg" clock name specific to the OF node Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Gerhard Sittig Signed-off-by: Anatolij Gustschin --- diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index fe9898c..c1e84ae 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1578,7 +1578,7 @@ static int viu_of_probe(struct platform_device *op) } /* enable VIU clock */ - clk = devm_clk_get(&op->dev, "viu_clk"); + clk = devm_clk_get(&op->dev, "ipg"); if (IS_ERR(clk)) { dev_err(&op->dev, "failed to lookup the clock!\n"); ret = PTR_ERR(clk);