aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorBen Dooks <ben.dooks@codethink.co.uk>2014-03-31 10:50:34 -0400
committerMike Turquette <mturquette@linaro.org>2014-03-31 20:06:28 -0400
commit365b01869bca1c9d5ecb05be7857739fa18a9b8c (patch)
treefb4ef381f4dd034cc9d831ed30b03269189c6a58 /drivers/clk
parente5ca8fb4cca90706e115f65097a775795415eca5 (diff)
clk: shmobile: rcar-gen2: fix lb/sd0/sd1/sdh clock parent to pll1
The clock generator for rcar-gen2 has the lb, sdh, sd0 and sd1 clocks parented to pll1_div2 where the hardware diagram shows these to be directly fed from pll1. This fixes the initial rate for sdh0 clock to be 97.5MHz instead of the reported 48MHz where the manual says the default register values are for 97.5MHz. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/shmobile/clk-rcar-gen2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
index dd272a0d1446..a32eddd32589 100644
--- a/drivers/clk/shmobile/clk-rcar-gen2.c
+++ b/drivers/clk/shmobile/clk-rcar-gen2.c
@@ -210,22 +210,22 @@ rcar_gen2_cpg_register_clock(struct device_node *np, struct rcar_gen2_cpg *cpg,
210 parent_name = "main"; 210 parent_name = "main";
211 mult = config->pll3_mult; 211 mult = config->pll3_mult;
212 } else if (!strcmp(name, "lb")) { 212 } else if (!strcmp(name, "lb")) {
213 parent_name = "pll1_div2"; 213 parent_name = "pll1";
214 div = cpg_mode & BIT(18) ? 36 : 24; 214 div = cpg_mode & BIT(18) ? 36 : 24;
215 } else if (!strcmp(name, "qspi")) { 215 } else if (!strcmp(name, "qspi")) {
216 parent_name = "pll1_div2"; 216 parent_name = "pll1_div2";
217 div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2) 217 div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2)
218 ? 8 : 10; 218 ? 8 : 10;
219 } else if (!strcmp(name, "sdh")) { 219 } else if (!strcmp(name, "sdh")) {
220 parent_name = "pll1_div2"; 220 parent_name = "pll1";
221 table = cpg_sdh_div_table; 221 table = cpg_sdh_div_table;
222 shift = 8; 222 shift = 8;
223 } else if (!strcmp(name, "sd0")) { 223 } else if (!strcmp(name, "sd0")) {
224 parent_name = "pll1_div2"; 224 parent_name = "pll1";
225 table = cpg_sd01_div_table; 225 table = cpg_sd01_div_table;
226 shift = 4; 226 shift = 4;
227 } else if (!strcmp(name, "sd1")) { 227 } else if (!strcmp(name, "sd1")) {
228 parent_name = "pll1_div2"; 228 parent_name = "pll1";
229 table = cpg_sd01_div_table; 229 table = cpg_sd01_div_table;
230 shift = 0; 230 shift = 0;
231 } else if (!strcmp(name, "z")) { 231 } else if (!strcmp(name, "z")) {