diff options
| author | Vipul Kumar Samar <vipulkumar.samar@st.com> | 2012-07-06 15:52:36 +0530 |
|---|---|---|
| committer | Shiraz Hashim <shiraz.hashim@st.com> | 2012-07-18 10:04:53 +0530 |
| commit | d4f513ff12c1d74b379715e78c01002f5d055315 (patch) | |
| tree | c29bb95a5f7f113d162785d30e7d7d5393cbb8bc /drivers | |
| parent | d9ba8db2157654e2fc159a63c4b6eb8cffb352ae (diff) | |
| download | linux-d4f513ff12c1d74b379715e78c01002f5d055315.tar.gz linux-d4f513ff12c1d74b379715e78c01002f5d055315.tar.bz2 linux-d4f513ff12c1d74b379715e78c01002f5d055315.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/spear/spear1340_clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/spear/spear1340_clock.c b/drivers/clk/spear/spear1340_clock.c index 44846987ee64..2352cee7f645 100644 --- a/drivers/clk/spear/spear1340_clock.c +++ b/drivers/clk/spear/spear1340_clock.c @@ -369,8 +369,8 @@ static struct frac_rate_tbl gen_rtbl[] = { /* clock parents */ static const char *vco_parents[] = { "osc_24m_clk", "osc_25m_clk", }; -static const char *sys_parents[] = { "none", "pll1_clk", "none", "none", - "sys_syn_clk", "none", "pll2_clk", "pll3_clk", }; +static const char *sys_parents[] = { "pll1_clk", "pll1_clk", "pll1_clk", + "pll1_clk", "sys_synth_clk", "sys_synth_clk", "pll2_clk", "pll3_clk", }; static const char *ahb_parents[] = { "cpu_div3_clk", "amba_syn_clk", }; static const char *gpt_parents[] = { "osc_24m_clk", "apb_clk", }; static const char *uart0_parents[] = { "pll5_clk", "osc_24m_clk", |