| From e83caf0f56d8c7aa2260c5fad3ca3b59792d723e Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 20 Nov 2013 17:00:05 +0900 |
| Subject: ARM: shmobile: Add r8a7791 clocks for thermal devices |
| |
| Add the r8a7791 thermal device as legacy clocks. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 8476cee684a68564d315043953fe090b36e9cfd2) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7791.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c |
| index fda7c6cb6921..ff2d60d55bd5 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7791.c |
| @@ -124,6 +124,7 @@ static struct clk *main_clks[] = { |
| enum { |
| MSTP726, MSTP724, MSTP723, MSTP721, MSTP720, |
| MSTP719, MSTP718, MSTP715, MSTP714, |
| + MSTP522, |
| MSTP216, MSTP207, MSTP206, |
| MSTP204, MSTP203, MSTP202, MSTP1105, MSTP1106, MSTP1107, |
| MSTP124, |
| @@ -140,6 +141,7 @@ static struct clk mstp_clks[MSTP_NR] = { |
| [MSTP718] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 18, 0), /* SCIF3 */ |
| [MSTP715] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 15, 0), /* SCIF4 */ |
| [MSTP714] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 14, 0), /* SCIF5 */ |
| + [MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */ |
| [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */ |
| [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */ |
| [MSTP206] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 6, 0), /* SCIFB0 */ |
| @@ -188,6 +190,8 @@ static struct clk_lookup lookups[] = { |
| CLKDEV_DEV_ID("sh-sci.13", &mstp_clks[MSTP1106]), /* SCIFA4 */ |
| CLKDEV_DEV_ID("sh-sci.14", &mstp_clks[MSTP1107]), /* SCIFA5 */ |
| CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]), |
| + CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]), |
| + CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), |
| }; |
| |
| #define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31) \ |
| -- |
| 1.8.5.rc3 |
| |