| From 0ff1145693a5ad05ab440085288305069a17d038 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 4 Mar 2014 18:09:15 +0100 |
| Subject: clocksource: sh_mtu2: Rename clock to "fck" in the non-legacy case |
| |
| The sh_mtu2 driver gets the MTU2 functional clock using a connection ID |
| of "mtu2_fck". While all SH SoCs create clock lookup entries with a NULL |
| device ID and a "mtu2_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> |
| Tested-by: Wolfram Sang <wsa@sang-engineering.com> |
| (cherry picked from commit 6dc9693bb3997cb324a2ffb39deaa72081a9bd0d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_mtu2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c |
| index 7cc6d9429f81..3a3785702422 100644 |
| --- a/drivers/clocksource/sh_mtu2.c |
| +++ b/drivers/clocksource/sh_mtu2.c |
| @@ -465,7 +465,7 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, |
| } |
| |
| /* Get hold of clock. */ |
| - mtu->clk = clk_get(&mtu->pdev->dev, "mtu2_fck"); |
| + mtu->clk = clk_get(&mtu->pdev->dev, mtu->legacy ? "mtu2_fck" : "fck"); |
| if (IS_ERR(mtu->clk)) { |
| dev_err(&mtu->pdev->dev, "cannot get clock\n"); |
| return PTR_ERR(mtu->clk); |
| -- |
| 2.1.2 |
| |
