| From 5b01481271f3ced5d49d0118750a36572124b9c9 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_tmu: Rename clock to "fck" in the non-legacy case |
| |
| The sh_tmu driver gets the TMU functional clock using a connection ID of |
| "tmu_fck". While all SH SoCs create clock lookup entries with a NULL |
| device ID and a "tmu_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 a27d922749f3be0a88f7e0aeb507c373703c08ee) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_tmu.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c |
| index 0306d31e9f1d..cf07797dbcf3 100644 |
| --- a/drivers/clocksource/sh_tmu.c |
| +++ b/drivers/clocksource/sh_tmu.c |
| @@ -568,7 +568,8 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) |
| tmu->model = id->driver_data; |
| |
| /* Get hold of clock. */ |
| - tmu->clk = clk_get(&tmu->pdev->dev, "tmu_fck"); |
| + tmu->clk = clk_get(&tmu->pdev->dev, |
| + tmu->model == SH_TMU_LEGACY ? "tmu_fck" : "fck"); |
| if (IS_ERR(tmu->clk)) { |
| dev_err(&tmu->pdev->dev, "cannot get clock\n"); |
| return PTR_ERR(tmu->clk); |
| -- |
| 2.1.2 |
| |