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

Commit a4fc9274 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2xxx: clock: fix clockdomains on gpt7_ick, 2430 mmchs2_fck clocks 



Add a clockdomain to the GPTIMER7 interface and 2430 HSMMC2 functional
clocks - both were previously missing them.

Also, the 2430 mmchs1_fck is in core_l3_clkdm, but should be in
core_l4_clkdm; fix this.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 691abf52

arch/arm/mach-omap2/clock2420_data.c

+1 −0
Original line number Diff line number Diff line
@@ -987,6 +987,7 @@ static struct clk gpt7_ick = { 
	.name		= "gpt7_ick",

	.ops		= &clkops_omap2_iclk_dflt_wait,

	.parent		= &l4_ck,

	.clkdm_name	= "core_l4_clkdm",

	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),

	.enable_bit	= OMAP24XX_EN_GPT7_SHIFT,

	.recalc		= &followparent_recalc,

arch/arm/mach-omap2/clock2430_data.c

+3 −1
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ static struct clk gpt7_ick = { 
	.name		= "gpt7_ick",

	.ops		= &clkops_omap2_iclk_dflt_wait,

	.parent		= &l4_ck,

	.clkdm_name	= "core_l4_clkdm",

	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),

	.enable_bit	= OMAP24XX_EN_GPT7_SHIFT,

	.recalc		= &followparent_recalc,
@@ -1747,7 +1748,7 @@ static struct clk mmchs1_fck = { 
	.name		= "mmchs1_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &func_96m_ck,

	.clkdm_name	= "core_l3_clkdm",

	.clkdm_name	= "core_l4_clkdm",

	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),

	.enable_bit	= OMAP2430_EN_MMCHS1_SHIFT,

	.recalc		= &followparent_recalc,
@@ -1767,6 +1768,7 @@ static struct clk mmchs2_fck = { 
	.name		= "mmchs2_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &func_96m_ck,

	.clkdm_name	= "core_l4_clkdm",

	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),

	.enable_bit	= OMAP2430_EN_MMCHS2_SHIFT,

	.recalc		= &followparent_recalc,