This patch add support for a new clock type for Exynos3250 CPU clock provider
and modify little difference of DIV_CPU0 between Exynos4 and Exynos3250.
Cc: Tomas Abraham <thomas.ab@xxxxxxxxxxx>
Cc: Tomasz Figa <t.figa@xxxxxxxxxxx>
Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
drivers/clk/samsung/clk-cpu.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c
index 13fa4c5..ccdcd6a 100644
--- a/drivers/clk/samsung/clk-cpu.c
+++ b/drivers/clk/samsung/clk-cpu.c
@@ -36,6 +36,9 @@
#define EXYNOS4210_DIV1_HPM_MASK ((0x7 << 0) | (0x7 << 4))
#define EXYNOS4210_MUX_HPM_MASK (1 << 20)
+#define EXYNOS3250_DIV_CPU0(d3, d2, d1, d0) \
+ (((d3) << 24) | ((d2) << 20) | ((d1) << 16) | ((d0) << 4))
+
/**
* struct exynos4210_armclk_data: config data to setup exynos4210 cpu clocks.
* @prate: frequency of the parent clock.
@@ -384,11 +387,27 @@ static int __init exynos4210_armclk_parser(struct device_node *np, void **data)
ptr = of_prop_next_u32(prop, ptr, &cfg[col]);
tdata->prate = cfg[0] * 1000;
- tdata->div0 = EXYNOS4210_DIV_CPU0(cfg[6], cfg[5], cfg[4],
- cfg[3], cfg[2], cfg[1]);
- tdata->div1 = cells == 10 ?
- EXYNOS4210_DIV_CPU1(cfg[9], cfg[8], cfg[7]) :
- EXYNOS4210_DIV_CPU1(0, cfg[8], cfg[7]);
+
+ switch (cells) {
+ case 7:
+ tdata->div0 = EXYNOS3250_DIV_CPU0(cfg[4], cfg[3],
+ cfg[2], cfg[1]);
+ tdata->div1 = EXYNOS4210_DIV_CPU1(0, cfg[6], cfg[5]);
+ break;
+ case 9:
+ tdata->div0 = EXYNOS4210_DIV_CPU0(cfg[6], cfg[5],
+ cfg[4], cfg[3], cfg[2], cfg[1]);
+ tdata->div1 = EXYNOS4210_DIV_CPU1(0, cfg[8], cfg[7]);
+ break;
+ case 10:
+ tdata->div0 = EXYNOS4210_DIV_CPU0(cfg[6], cfg[5],
+ cfg[4], cfg[3], cfg[2], cfg[1]);
+ tdata->div1 = EXYNOS4210_DIV_CPU1(cfg[9], cfg[8],
+ cfg[7]);
+ break;
+ default:
+ return -EINVAL;
+ }
}
tdata->prate = 0;
return 0;
@@ -409,6 +428,8 @@ static const struct exynos_cpuclk_soc_data exynos5250_cpuclk_soc_data = {
};
static const struct of_device_id exynos_clock_ids_armclk[] = {
+ { .compatible = "samsung,exynos3250-cmu",
+ .data = &exynos4210_cpuclk_soc_data, },
{ .compatible = "samsung,exynos4210-clock",
.data = &exynos4210_cpuclk_soc_data, },
{ .compatible = "samsung,exynos4412-clock",
--
1.8.0
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
