Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

CLK: SPEAr13xx: fix parent names of multiple clocks

This patch fixes parent names of multiple clocks.

Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

authored by

Shiraz Hashim and committed by
Mike Turquette
463f9e20 e0b9c210

+4 -4
+1 -1
drivers/clk/spear/spear1310_clock.c
··· 664 664 clk_register_clkdev(clk, "i2s_ref_pad_clk", NULL); 665 665 666 666 clk = clk_register_aux("i2s_sclk_clk", "i2s_sclk_gclk", 667 - "i2s_ref_pad_clk", 0, SPEAR1310_I2S_CLK_CFG, 667 + "i2s_ref_mclk", 0, SPEAR1310_I2S_CLK_CFG, 668 668 &i2s_sclk_masks, i2s_sclk_rtbl, 669 669 ARRAY_SIZE(i2s_sclk_rtbl), &_lock, &clk1); 670 670 clk_register_clkdev(clk, "i2s_sclk_clk", NULL);
+3 -3
drivers/clk/spear/spear1340_clock.c
··· 370 370 /* clock parents */ 371 371 static const char *vco_parents[] = { "osc_24m_clk", "osc_25m_clk", }; 372 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", }; 373 + "pll1_clk", "sys_syn_clk", "sys_syn_clk", "pll2_clk", "pll3_clk", }; 374 374 static const char *ahb_parents[] = { "cpu_div3_clk", "amba_syn_clk", }; 375 375 static const char *gpt_parents[] = { "osc_24m_clk", "apb_clk", }; 376 376 static const char *uart0_parents[] = { "pll5_clk", "osc_24m_clk", ··· 391 391 392 392 static const char *gen_synth0_1_parents[] = { "vco1div4_clk", "vco3div2_clk", 393 393 "pll3_clk", }; 394 - static const char *gen_synth2_3_parents[] = { "vco1div4_clk", "vco3div2_clk", 394 + static const char *gen_synth2_3_parents[] = { "vco1div4_clk", "vco2div2_clk", 395 395 "pll2_clk", }; 396 396 397 397 void __init spear1340_clk_init(void) ··· 956 956 &_lock); 957 957 clk_register_clkdev(clk, NULL, "d0500000.cam3"); 958 958 959 - clk = clk_register_gate(NULL, "pwm_clk", "pwm_mclk", 0, 959 + clk = clk_register_gate(NULL, "pwm_clk", "ahb_clk", 0, 960 960 SPEAR1340_PERIP3_CLK_ENB, SPEAR1340_PWM_CLK_ENB, 0, 961 961 &_lock); 962 962 clk_register_clkdev(clk, NULL, "e0180000.pwm");