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

Commit 0135f6a0 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5',... 

Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3.5' and 'pwrdm_clkdm_cleanup_3.5' into prcm_devel_a_3.5
parents f0c54d31 610eb8c2 8f97437e 48a6884f

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ void omap2_clk_disable_unused(struct clk *clk) 
		clk->ops->disable(clk);

	}

	if (clk->clkdm != NULL)

		pwrdm_clkdm_state_switch(clk->clkdm);

		pwrdm_state_switch(clk->clkdm->pwrdm.ptr);

}

#endif

arch/arm/mach-omap2/clock3xxx_data.c

+2 −1
Original line number Diff line number Diff line 
/*

 * OMAP3 clock data

 *

 * Copyright (C) 2007-2010 Texas Instruments, Inc.

 * Copyright (C) 2007-2010, 2012 Texas Instruments, Inc.

 * Copyright (C) 2007-2011 Nokia Corporation

 *

 * Written by Paul Walmsley
@@ -1640,6 +1640,7 @@ static struct clk hdq_fck = { 
	.name		= "hdq_fck",

	.ops		= &clkops_omap2_dflt_wait,

	.parent		= &core_12m_fck,

	.clkdm_name	= "core_l4_clkdm",

	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),

	.enable_bit	= OMAP3430_EN_HDQ_SHIFT,

	.recalc		= &followparent_recalc,

arch/arm/mach-omap2/clock44xx_data.c

+0 −11
Original line number Diff line number Diff line
@@ -3355,17 +3355,6 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"auxclk5_ck",			&auxclk5_ck,	CK_443X),

	CLK(NULL,	"auxclkreq5_ck",		&auxclkreq5_ck,	CK_443X),

	CLK(NULL,	"gpmc_ck",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt1_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt2_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt3_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt4_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt5_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt6_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt7_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt8_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt9_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt10_ick",			&dummy_ck,	CK_443X),

	CLK(NULL,	"gpt11_ick",			&dummy_ck,	CK_443X),

	CLK("omap_i2c.1",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap_i2c.2",	"ick",				&dummy_ck,	CK_443X),

	CLK("omap_i2c.3",	"ick",				&dummy_ck,	CK_443X),

arch/arm/mach-omap2/clockdomain.c

+3 −4
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ void clkdm_allow_idle(struct clockdomain *clkdm) 
	spin_lock_irqsave(&clkdm->lock, flags);

	clkdm->_flags |= _CLKDM_FLAG_HWSUP_ENABLED;

	arch_clkdm->clkdm_allow_idle(clkdm);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);

}
@@ -924,8 +924,7 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm) 


	spin_lock_irqsave(&clkdm->lock, flags);

	arch_clkdm->clkdm_clk_enable(clkdm);

	pwrdm_wait_transition(clkdm->pwrdm.ptr);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);



	pr_debug("clockdomain: clkdm %s: enabled\n", clkdm->name);
@@ -950,7 +949,7 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm) 


	spin_lock_irqsave(&clkdm->lock, flags);

	arch_clkdm->clkdm_clk_disable(clkdm);

	pwrdm_clkdm_state_switch(clkdm);

	pwrdm_state_switch(clkdm->pwrdm.ptr);

	spin_unlock_irqrestore(&clkdm->lock, flags);



	pr_debug("clockdomain: clkdm %s: disabled\n", clkdm->name);

arch/arm/mach-omap2/clockdomains3xxx_data.c

+3 −3
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ 
 * 3430ES2 PM_WKDEP_SGX: adds IVA2, removes CORE

 */

static struct clkdm_dep gfx_sgx_3xxx_wkdeps[] = {

	{ .clkdm_name = "iva2_clkdm", },

	{ .clkdm_name = "mpu_clkdm", },

	{ .clkdm_name = "wkup_clkdm", },

	{ .clkdm_name = "iva2_clkdm" },

	{ .clkdm_name = "mpu_clkdm" },

	{ .clkdm_name = "wkup_clkdm" },

	{ NULL },

};