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

Commit a1fed577 authored Feb 25, 2011 by Paul Walmsley

OMAP2xxx: clock: fix parents for L3-derived clocks



Several clocks are listed as having the core L4 clock as their parent,
when they are actually derived from the L3 clock.  Fix these.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

parent 4ef70c06

arch/arm/mach-omap2/clock2420_data.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1614,7 +1614,7 @@ static struct clk sdma_fck = {
	static struct clk sdma_ick = {		static struct clk sdma_ick = {
	.name = "sdma_ick",		.name = "sdma_ick",
	.ops = &clkops_omap2_iclk_idle_only,		.ops = &clkops_omap2_iclk_idle_only,
	.parent = &l4_ck,		.parent = &core_l3_ck,
	.clkdm_name = "core_l3_clkdm",		.clkdm_name = "core_l3_clkdm",
	.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),		.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
	.enable_bit = OMAP24XX_AUTO_SDMA_SHIFT,		.enable_bit = OMAP24XX_AUTO_SDMA_SHIFT,

arch/arm/mach-omap2/clock2430_data.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1652,7 +1652,7 @@ static struct clk sdma_fck = {
	static struct clk sdma_ick = {		static struct clk sdma_ick = {
	.name = "sdma_ick",		.name = "sdma_ick",
	.ops = &clkops_omap2_iclk_idle_only,		.ops = &clkops_omap2_iclk_idle_only,
	.parent = &l4_ck,		.parent = &core_l3_ck,
	.clkdm_name = "core_l3_clkdm",		.clkdm_name = "core_l3_clkdm",
	.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),		.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
	.enable_bit = OMAP24XX_AUTO_SDMA_SHIFT,		.enable_bit = OMAP24XX_AUTO_SDMA_SHIFT,
	@@ -1662,9 +1662,9 @@ static struct clk sdma_ick = {
	static struct clk sdrc_ick = {		static struct clk sdrc_ick = {
	.name = "sdrc_ick",		.name = "sdrc_ick",
	.ops = &clkops_omap2_iclk_idle_only,		.ops = &clkops_omap2_iclk_idle_only,
	.parent = &l4_ck,		.parent = &core_l3_ck,
	.flags = ENABLE_ON_INIT,		.flags = ENABLE_ON_INIT,
	.clkdm_name = "core_l4_clkdm",		.clkdm_name = "core_l3_clkdm",
	.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),		.enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
	.enable_bit = OMAP2430_EN_SDRC_SHIFT,		.enable_bit = OMAP2430_EN_SDRC_SHIFT,
	.recalc = &followparent_recalc,		.recalc = &followparent_recalc,