Commit 8d61d7f9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-for-v3.9/pm-signed' into omap-for-v3.9/pm-wfi-take2 

OMAP PM related updates via Paul Walmsley <paul@pwsan.com>:

Remove some dead OMAP clock and device integration code and data.
Also, clean up the way that the OMAP device integration code blocks
WFI/WFE to use a consistent mechanism, controlled by a data flag.

Several OMAP2+ power management fixes, optimizations, and cleanup.
This series is a prerequisite for the functional powerdomain
conversion series.
parents 88b62b91 0e084c9c

arch/arm/mach-omap2/am35xx-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, 
	struct platform_device *pdev;



	pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len,

				 NULL, 0, false);

				 false);

	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",

		     oh->class->name, oh->name);

arch/arm/mach-omap2/cclock2420_data.c

+1 −15
Original line number Diff line number Diff line
@@ -622,15 +622,10 @@ static struct clk_hw_omap gpios_fck_hw = { 


DEFINE_STRUCT_CLK(gpios_fck, gpios_fck_parent_names, aes_ick_ops);



static struct clk wu_l4_ick;



DEFINE_STRUCT_CLK_HW_OMAP(wu_l4_ick, "wkup_clkdm");

DEFINE_STRUCT_CLK(wu_l4_ick, dpll_ck_parent_names, core_ck_ops);



static struct clk gpios_ick;



static const char *gpios_ick_parent_names[] = {

	"wu_l4_ick",

	"sys_ck",

};



static struct clk_hw_omap gpios_ick_hw = {
@@ -1682,13 +1677,6 @@ static struct clk_hw_omap wdt1_ick_hw = { 


DEFINE_STRUCT_CLK(wdt1_ick, gpios_ick_parent_names, aes_ick_ops);



static struct clk wdt1_osc_ck;



static const struct clk_ops wdt1_osc_ck_ops = {};



DEFINE_STRUCT_CLK_HW_OMAP(wdt1_osc_ck, NULL);

DEFINE_STRUCT_CLK(wdt1_osc_ck, sys_ck_parent_names, wdt1_osc_ck_ops);



static struct clk wdt3_fck;



static struct clk_hw_omap wdt3_fck_hw = {
@@ -1767,7 +1755,6 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"func_96m_ck",	&func_96m_ck,	CK_242X),

	CLK(NULL,	"func_48m_ck",	&func_48m_ck,	CK_242X),

	CLK(NULL,	"func_12m_ck",	&func_12m_ck,	CK_242X),

	CLK(NULL,	"ck_wdt1_osc",	&wdt1_osc_ck,	CK_242X),

	CLK(NULL,	"sys_clkout_src", &sys_clkout_src, CK_242X),

	CLK(NULL,	"sys_clkout",	&sys_clkout,	CK_242X),

	CLK(NULL,	"sys_clkout2_src", &sys_clkout2_src, CK_242X),
@@ -1797,7 +1784,6 @@ static struct omap_clk omap2420_clks[] = { 
	/* L4 domain clocks */

	CLK(NULL,	"l4_ck",	&l4_ck,		CK_242X),

	CLK(NULL,	"ssi_l4_ick",	&ssi_l4_ick,	CK_242X),

	CLK(NULL,	"wu_l4_ick",	&wu_l4_ick,	CK_242X),

	/* virtual meta-group clock */

	CLK(NULL,	"virt_prcm_set", &virt_prcm_set, CK_242X),

	/* general l4 interface ck, multi-parent functional clk */

arch/arm/mach-omap2/cclock2430_data.c

+1 −15
Original line number Diff line number Diff line
@@ -601,15 +601,10 @@ static struct clk_hw_omap gpios_fck_hw = { 


DEFINE_STRUCT_CLK(gpios_fck, gpio5_fck_parent_names, aes_ick_ops);



static struct clk wu_l4_ick;



DEFINE_STRUCT_CLK_HW_OMAP(wu_l4_ick, "wkup_clkdm");

DEFINE_STRUCT_CLK(wu_l4_ick, dpll_ck_parent_names, core_ck_ops);



static struct clk gpios_ick;



static const char *gpios_ick_parent_names[] = {

	"wu_l4_ick",

	"sys_ck",

};



static struct clk_hw_omap gpios_ick_hw = {
@@ -1811,13 +1806,6 @@ static struct clk_hw_omap wdt1_ick_hw = { 


DEFINE_STRUCT_CLK(wdt1_ick, gpios_ick_parent_names, aes_ick_ops);



static struct clk wdt1_osc_ck;



static const struct clk_ops wdt1_osc_ck_ops = {};



DEFINE_STRUCT_CLK_HW_OMAP(wdt1_osc_ck, NULL);

DEFINE_STRUCT_CLK(wdt1_osc_ck, sys_ck_parent_names, wdt1_osc_ck_ops);



static struct clk wdt4_fck;



static struct clk_hw_omap wdt4_fck_hw = {
@@ -1869,7 +1857,6 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"func_96m_ck",	&func_96m_ck,	CK_243X),

	CLK(NULL,	"func_48m_ck",	&func_48m_ck,	CK_243X),

	CLK(NULL,	"func_12m_ck",	&func_12m_ck,	CK_243X),

	CLK(NULL,	"ck_wdt1_osc",	&wdt1_osc_ck,	CK_243X),

	CLK(NULL,	"sys_clkout_src", &sys_clkout_src, CK_243X),

	CLK(NULL,	"sys_clkout",	&sys_clkout,	CK_243X),

	CLK(NULL,	"emul_ck",	&emul_ck,	CK_243X),
@@ -1898,7 +1885,6 @@ static struct omap_clk omap2430_clks[] = { 
	/* L4 domain clocks */

	CLK(NULL,	"l4_ck",	&l4_ck,		CK_243X),

	CLK(NULL,	"ssi_l4_ick",	&ssi_l4_ick,	CK_243X),

	CLK(NULL,	"wu_l4_ick",	&wu_l4_ick,	CK_243X),

	/* virtual meta-group clock */

	CLK(NULL,	"virt_prcm_set", &virt_prcm_set, CK_243X),

	/* general l4 interface ck, multi-parent functional clk */

arch/arm/mach-omap2/cclock44xx_data.c

+119 −459

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clockdomain.c

+378 −191

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE