On 16 October 2013 11:10, Chander Kashyap <chander.kashyap@xxxxxxxxxx> wrote: > On 26 September 2013 14:36, Chander Kashyap <chander.kashyap@xxxxxxxxxx> wrote: >> Fixes cpll control and lock register offset values for Exynos5420 SoC. >> >> Signed-off-by: Chander Kashyap <chander.kashyap@xxxxxxxxxx> >> Acked-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx> >> --- >> Changes Since v1: >> - Fixed patch subject as per Kukgin suggestion. >> >> drivers/clk/samsung/clk-exynos5420.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c >> index 86dfc64..892aac0 100644 >> --- a/drivers/clk/samsung/clk-exynos5420.c >> +++ b/drivers/clk/samsung/clk-exynos5420.c >> @@ -730,8 +730,8 @@ struct samsung_gate_clock exynos5420_gate_clks[] __initdata = { >> struct __initdata samsung_pll_clock exynos5420_plls[nr_plls] = { >> [apll] = PLL(pll_2550, fout_apll, "fout_apll", "fin_pll", APLL_LOCK, >> APLL_CON0, NULL), >> - [cpll] = PLL(pll_2550, fout_mpll, "fout_mpll", "fin_pll", MPLL_LOCK, >> - MPLL_CON0, NULL), >> + [cpll] = PLL(pll_2550, fout_cpll, "fout_cpll", "fin_pll", CPLL_LOCK, >> + CPLL_CON0, NULL), >> [dpll] = PLL(pll_2550, fout_dpll, "fout_dpll", "fin_pll", DPLL_LOCK, >> DPLL_CON0, NULL), >> [epll] = PLL(pll_2650, fout_epll, "fout_epll", "fin_pll", EPLL_LOCK, >> -- >> 1.7.9.5 >> > > > Mike, can you please take this patch. Can this patch be merged? > > -- > with warm regards, > Chander Kashyap -- with warm regards, Chander Kashyap -- 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