| From 273e4a0e8d62791ce64b82b8175e0a74da83d335 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 14 Feb 2014 00:35:18 +0100 |
| Subject: clocksource: sh_cmt: Rename clock to "fck" in the non-legacy case |
| |
| The sh_cmt driver gets the CMT functional clock using a connection ID of |
| "cmt_fck". While all SH SoCs create clock lookup entries with a NULL |
| device ID and a "cmt_fck" connection ID, the ARM SoCs use the device ID |
| only with a NULL connection ID. This works on legacy platforms but will |
| break on ARM with DT boot. |
| |
| Fix the situation by using a connection ID of "fck" in the non-legacy |
| platform data case. Clock lookup entries will be renamed to use the |
| device ID as well as the connection ID as platforms get moved to new |
| platform data. The legacy code will eventually be dropped, leaving us |
| with device ID based clock lookup, compatible with DT boot. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 24b4e07df54b7bf7739fb3dd193f639a8f274ad6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_cmt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c |
| index 1efe7d64efca..a5ea9aedbd50 100644 |
| --- a/drivers/clocksource/sh_cmt.c |
| +++ b/drivers/clocksource/sh_cmt.c |
| @@ -1007,7 +1007,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) |
| cmt->legacy = cmt->info ? false : true; |
| |
| /* Get hold of clock. */ |
| - cmt->clk = clk_get(&cmt->pdev->dev, "cmt_fck"); |
| + cmt->clk = clk_get(&cmt->pdev->dev, cmt->legacy ? "cmt_fck" : "fck"); |
| if (IS_ERR(cmt->clk)) { |
| dev_err(&cmt->pdev->dev, "cannot get clock\n"); |
| return PTR_ERR(cmt->clk); |
| -- |
| 2.1.2 |
| |
