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

Commit 3c8cee3b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

* 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6: add missing twd_clk for imx6q clock
parents d1a8c54b 5e540a5a

arch/arm/mach-imx/clock-imx6q.c

+11 −0
Original line number Diff line number Diff line
@@ -814,6 +814,16 @@ DEF_PFD(pll3_pfd_540m, PFD_480, PFD1, &pll3_usb_otg); 
DEF_PFD(pll3_pfd_508m, PFD_480, PFD2, &pll3_usb_otg);

DEF_PFD(pll3_pfd_454m, PFD_480, PFD3, &pll3_usb_otg);



static unsigned long twd_clk_get_rate(struct clk *clk)

{

	return clk_get_rate(clk->parent) / 2;

}



static struct clk twd_clk = {

	.parent = &arm_clk,

	.get_rate = twd_clk_get_rate,

};



static unsigned long pll2_200m_get_rate(struct clk *clk)

{

	return clk_get_rate(clk->parent) / 2;
@@ -1894,6 +1904,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("20ec000.sdma", NULL, sdma_clk),

	_REGISTER_CLOCK("20bc000.wdog", NULL, dummy_clk),

	_REGISTER_CLOCK("20c0000.wdog", NULL, dummy_clk),

	_REGISTER_CLOCK("smp_twd", NULL, twd_clk),

	_REGISTER_CLOCK(NULL, "ckih", ckih_clk),

	_REGISTER_CLOCK(NULL, "ckil_clk", ckil_clk),

	_REGISTER_CLOCK(NULL, "aips_tz1_clk", aips_tz1_clk),