openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC 

Commit 42773b28e7 ("clk: samsung: exynos4: Enable ARMCLK
down feature") enabled ARMCLK down feature on all Exynos4
SoCs.  Unfortunately on Exynos4210 SoC ARMCLK down feature
causes a lockup when ondemand cpufreq governor is used.
Fix it by limiting ARMCLK down feature to Exynos4x12 SoCs.

This patch was tested on:
- Exynos4210 SoC based Trats board
- Exynos4210 SoC based Origen board
- Exynos4412 SoC based Trats2 board
- Exynos4412 SoC based Odroid-U3 board

Cc: Daniel Drake <drake@endlessm.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Fixes: 42773b28e7 ("clk: samsung: exynos4: Enable ARMCLK down feature")
Cc: <stable@vger.kernel.org> # v3.17+
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2015-03-27 17:27:10 +01:00 committed by Michael Turquette
parent 692d8328e8
commit 3a9e9cb65b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/clk/samsung/clk-exynos4.c
View File

@ -1354,7 +1354,7 @@ static struct samsung_pll_clock exynos4x12_plls[nr_plls] __initdata = {
VPLL_LOCK, VPLL_CON0, NULL), VPLL_LOCK, VPLL_CON0, NULL),
}; };
static void __init exynos4_core_down_clock(enum exynos4_soc soc) static void __init exynos4x12_core_down_clock(void)
{ {
unsigned int tmp; unsigned int tmp;
@ -1373,11 +1373,9 @@ static void __init exynos4_core_down_clock(enum exynos4_soc soc)
__raw_writel(tmp, reg_base + PWR_CTRL1); __raw_writel(tmp, reg_base + PWR_CTRL1);
/* /*
* Disable the clock up feature on Exynos4x12, in case it was * Disable the clock up feature in case it was enabled by bootloader.
* enabled by bootloader.
*/ */
if (exynos4_soc == EXYNOS4X12) __raw_writel(0x0, reg_base + E4X12_PWR_CTRL2);
__raw_writel(0x0, reg_base + E4X12_PWR_CTRL2);
} }
/* register exynos4 clocks */ /* register exynos4 clocks */
@ -1474,7 +1472,8 @@ static void __init exynos4_clk_init(struct device_node *np,
samsung_clk_register_alias(ctx, exynos4_aliases, samsung_clk_register_alias(ctx, exynos4_aliases,
ARRAY_SIZE(exynos4_aliases)); ARRAY_SIZE(exynos4_aliases));
exynos4_core_down_clock(soc); if (soc == EXYNOS4X12)
exynos4x12_core_down_clock();
exynos4_clk_sleep_init(); exynos4_clk_sleep_init();
samsung_clk_of_add_provider(np, ctx); samsung_clk_of_add_provider(np, ctx);