Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0446e9d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains
parents 80e23b7c 87d26d2d

arch/arm/plat-s3c64xx/s3c6400-clock.c

+1 −9
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct clk clk_ext_xtal_mux = { 
#define clk_fin_epll clk_ext_xtal_mux



#define clk_fout_mpll	clk_mpll

#define clk_fout_epll	clk_epll



struct clk_sources {

	unsigned int	nr_sources;
@@ -88,11 +89,6 @@ static struct clksrc_clk clk_mout_apll = { 
	.sources	= &clk_src_apll,

};



static struct clk clk_fout_epll = {

	.name		= "fout_epll",

	.id		= -1,

};



static struct clk *clk_src_epll_list[] = {

	[0] = &clk_fin_epll,

	[1] = &clk_fout_epll,
@@ -715,7 +711,6 @@ static struct clk *clks[] __initdata = { 
	&clk_iis_cd1,

	&clk_pcm_cd,

	&clk_mout_epll.clk,

	&clk_fout_epll,

	&clk_mout_mpll.clk,

	&clk_dout_mpll,

	&clk_mmc0.clk,
@@ -760,7 +755,4 @@ void __init s3c6400_register_clocks(unsigned armclk_divlimit) 
			       clkp->name, ret);

		}

	}



	clk_mpll.parent = &clk_mout_mpll.clk;

	clk_epll.parent = &clk_mout_epll.clk;

}