Commit 7b4bc079 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-cleanup-a-for-3.9' of... 

Merge tag 'omap-cleanup-a-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm

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.

Basic test logs for this branch are here:

   http://www.pwsan.com/omap/testlogs/cleanup_a_3.9/20130126014242/
parents 949db153 aff2f7d9

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/devices.c

+10 −15
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ static int __init omap3_l3_init(void) 
	if (!oh)

		pr_err("could not look up %s\n", oh_name);



	pdev = omap_device_build("omap_l3_smx", 0, oh, NULL, 0,

							   NULL, 0, 0);

	pdev = omap_device_build("omap_l3_smx", 0, oh, NULL, 0);



	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
@@ -96,8 +95,7 @@ static int __init omap4_l3_init(void) 
			pr_err("could not look up %s\n", oh_name);

	}



	pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL,

						     0, NULL, 0, 0);

	pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);



	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
@@ -273,7 +271,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data 
	keypad_data = sdp4430_keypad_data;



	pdev = omap_device_build(name, id, oh, keypad_data,

			sizeof(struct omap4_keypad_platform_data), NULL, 0, 0);

				 sizeof(struct omap4_keypad_platform_data));



	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",
@@ -297,7 +295,7 @@ static inline void __init omap_init_mbox(void) 
		return;

	}



	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",

						__func__, PTR_ERR(pdev));

}
@@ -337,7 +335,7 @@ static void __init omap_init_mcpdm(void) 
		return;

	}



	pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");

}

#else
@@ -358,7 +356,7 @@ static void __init omap_init_dmic(void) 
		return;

	}



	pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");

}

#else
@@ -384,8 +382,7 @@ static void __init omap_init_hdmi_audio(void) 
		return;

	}



	pdev = omap_device_build("omap-hdmi-audio-dai",

		-1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0, 0);

	WARN(IS_ERR(pdev),

	     "Can't build omap_device for omap-hdmi-audio-dai.\n");
@@ -429,8 +426,7 @@ static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused) 
	}



	spi_num++;

	pdev = omap_device_build(name, spi_num, oh, pdata,

				sizeof(*pdata),	NULL, 0, 0);

	pdev = omap_device_build(name, spi_num, oh, pdata, sizeof(*pdata));

	WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s\n",

				name, oh->name);

	kfree(pdata);
@@ -460,7 +456,7 @@ static void omap_init_rng(void) 
	if (!oh)

		return;



	pdev = omap_device_build("omap_rng", -1, oh, NULL, 0, NULL, 0, 0);

	pdev = omap_device_build("omap_rng", -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for omap_rng\n");

}
@@ -689,8 +685,7 @@ static void __init omap_init_ocp2scp(void) 


	pdata->dev_cnt	= dev_cnt;



	pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), NULL,

								0, false);

	pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata));

	if (IS_ERR(pdev)) {

		pr_err("Could not build omap_device for %s %s\n",

						name, oh_name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE