Skip to content

Commit d4f513f

Browse files
Vipul Kumar Samarshiraz-zz
authored andcommitted
Clk: SPEAr1340: Update sys clock parent array
sys_clk has multiple parents and selection of parent depends on sys_clk_ctrl register bit no. 23:25, with following possibilities 0XX: pll1_clk 10X: sys_synth_clk 110: pll2_clk 111: pll3_clk Out of several possibilities (h/w wise) to select same clock parent for sys_clk, current clock implementation was considering just one value. When bootloader programmed different (valid) value to select a clock parent then Linux breaks. Here, we try to include all possibilities which can lead to same clock selection thus making Linux independent of bootloader selection values. Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com> Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent d9ba8db commit d4f513f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/clk/spear/spear1340_clock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ static struct frac_rate_tbl gen_rtbl[] = {
369369

370370
/* clock parents */
371371
static const char *vco_parents[] = { "osc_24m_clk", "osc_25m_clk", };
372-
static const char *sys_parents[] = { "none", "pll1_clk", "none", "none",
373-
"sys_syn_clk", "none", "pll2_clk", "pll3_clk", };
372+
static const char *sys_parents[] = { "pll1_clk", "pll1_clk", "pll1_clk",
373+
"pll1_clk", "sys_synth_clk", "sys_synth_clk", "pll2_clk", "pll3_clk", };
374374
static const char *ahb_parents[] = { "cpu_div3_clk", "amba_syn_clk", };
375375
static const char *gpt_parents[] = { "osc_24m_clk", "apb_clk", };
376376
static const char *uart0_parents[] = { "pll5_clk", "osc_24m_clk",

0 commit comments

Comments
 (0)