Commit 02b83dcb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Initialize SoC PM later 



There's no need to probe devices until at module_init time and we
currently have at least PM trying to use I2C for PMICs early on.

As only a part of the SoC init_early is SoC specific, we only need to call
the SoC specific PM init function. And we can modify omap2_common_pm_late_init()
so it becomes a late_initcall().

Note that this changes am335x to call omap2_clk_enable_autoidle_all() that
seems to be missing currently.

Cc: Keerthy <j-keerthy@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 71941002

arch/arm/mach-omap2/common.h

+9 −7
Original line number Original line Diff line number Diff line
@@ -44,6 +44,9 @@ 




#define OMAP_INTC_START		NR_IRQS

#define OMAP_INTC_START		NR_IRQS





extern int (*omap_pm_soc_init)(void);

int omap_pm_nop_init(void);



#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP2)

#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP2)

int omap2_pm_init(void);

int omap2_pm_init(void);

#else

#else
@@ -79,9 +82,12 @@ static inline int omap4_pm_init_early(void) 




#if defined(CONFIG_PM) && (defined(CONFIG_SOC_AM33XX) || \

#if defined(CONFIG_PM) && (defined(CONFIG_SOC_AM33XX) || \

	defined(CONFIG_SOC_AM43XX))

	defined(CONFIG_SOC_AM43XX))

void amx3_common_pm_init(void);

int amx3_common_pm_init(void);

#else

#else

static inline void amx3_common_pm_init(void) { }

static inline int amx3_common_pm_init(void)

{

	return 0;

}

#endif

#endif





extern void omap2_init_common_infrastructure(void);

extern void omap2_init_common_infrastructure(void);
@@ -122,14 +128,10 @@ void am43xx_init_early(void); 
void am43xx_init_late(void);

void am43xx_init_late(void);

void omap4430_init_early(void);

void omap4430_init_early(void);

void omap5_init_early(void);

void omap5_init_early(void);

void omap3_init_late(void);	/* Do not use this one */

void omap3_init_late(void);

void omap4430_init_late(void);

void omap4430_init_late(void);

void omap2420_init_late(void);

void omap2420_init_late(void);

void omap2430_init_late(void);

void omap2430_init_late(void);

void omap3430_init_late(void);

void omap35xx_init_late(void);

void omap3630_init_late(void);

void am35xx_init_late(void);

void ti81xx_init_late(void);

void ti81xx_init_late(void);

void am33xx_init_late(void);

void am33xx_init_late(void);

void omap5_init_late(void);

void omap5_init_late(void);

arch/arm/mach-omap2/io.c

+9 −58
Original line number Original line Diff line number Diff line
@@ -422,11 +422,6 @@ static void __init __maybe_unused omap_hwmod_init_postsetup(void) 
	omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state);

	omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state);

}

}





static void __init __maybe_unused omap_common_late_init(void)

{

	omap2_common_pm_late_init();

}



#ifdef CONFIG_SOC_OMAP2420

#ifdef CONFIG_SOC_OMAP2420

void __init omap2420_init_early(void)

void __init omap2420_init_early(void)

{

{
@@ -447,9 +442,7 @@ void __init omap2420_init_early(void) 




void __init omap2420_init_late(void)

void __init omap2420_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap2_pm_init;

	omap2_pm_init();

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif
@@ -473,9 +466,7 @@ void __init omap2430_init_early(void) 




void __init omap2430_init_late(void)

void __init omap2430_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap2_pm_init;

	omap2_pm_init();

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif
@@ -526,43 +517,12 @@ void __init am35xx_init_early(void) 




void __init omap3_init_late(void)

void __init omap3_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap3_pm_init;

	omap3_pm_init();

	omap2_clk_enable_autoidle_all();

}



void __init omap3430_init_late(void)

{

	omap_common_late_init();

	omap3_pm_init();

	omap2_clk_enable_autoidle_all();

}



void __init omap35xx_init_late(void)

{

	omap_common_late_init();

	omap3_pm_init();

	omap2_clk_enable_autoidle_all();

}



void __init omap3630_init_late(void)

{

	omap_common_late_init();

	omap3_pm_init();

	omap2_clk_enable_autoidle_all();

}



void __init am35xx_init_late(void)

{

	omap_common_late_init();

	omap3_pm_init();

	omap2_clk_enable_autoidle_all();

}

}





void __init ti81xx_init_late(void)

void __init ti81xx_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap_pm_nop_init;

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif
@@ -618,8 +578,7 @@ void __init am33xx_init_early(void) 




void __init am33xx_init_late(void)

void __init am33xx_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = amx3_common_pm_init;

	amx3_common_pm_init();

}

}

#endif

#endif
@@ -642,9 +601,7 @@ void __init am43xx_init_early(void) 




void __init am43xx_init_late(void)

void __init am43xx_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = amx3_common_pm_init;

	omap2_clk_enable_autoidle_all();

	amx3_common_pm_init();

}

}

#endif

#endif
@@ -672,9 +629,7 @@ void __init omap4430_init_early(void) 




void __init omap4430_init_late(void)

void __init omap4430_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap4_pm_init;

	omap4_pm_init();

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif
@@ -700,9 +655,7 @@ void __init omap5_init_early(void) 




void __init omap5_init_late(void)

void __init omap5_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap4_pm_init;

	omap4_pm_init();

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif
@@ -725,9 +678,7 @@ void __init dra7xx_init_early(void) 




void __init dra7xx_init_late(void)

void __init dra7xx_init_late(void)

{

{

	omap_common_late_init();

	omap_pm_soc_init = omap4_pm_init;

	omap4_pm_init();

	omap2_clk_enable_autoidle_all();

}

}

#endif

#endif

arch/arm/mach-omap2/pm.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -230,8 +230,20 @@ static void __init omap4_init_voltages(void) 
	omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");

	omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");

}

}





int __maybe_unused omap_pm_nop_init(void)

{

	return 0;

}



int (*omap_pm_soc_init)(void);



int __init omap2_common_pm_late_init(void)

int __init omap2_common_pm_late_init(void)

{

{

	int error;



	if (!omap_pm_soc_init)

		return 0;



	/* Init the voltage layer */

	/* Init the voltage layer */

	omap3_twl_init();

	omap3_twl_init();

	omap4_twl_init();

	omap4_twl_init();
@@ -244,5 +256,12 @@ int __init omap2_common_pm_late_init(void) 
	/* Smartreflex device init */

	/* Smartreflex device init */

	omap_devinit_smartreflex();

	omap_devinit_smartreflex();





	error = omap_pm_soc_init();

	if (error)

		pr_warn("%s: pm soc init failed: %i\n", __func__, error);



	omap2_clk_enable_autoidle_all();



	return 0;

	return 0;

}

}

omap_late_initcall(omap2_common_pm_late_init);

arch/arm/mach-omap2/pm33xx-core.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ static struct am33xx_pm_platform_data *am33xx_pm_get_pdata(void) 
		return NULL;

		return NULL;

}

}





void __init amx3_common_pm_init(void)

int __init amx3_common_pm_init(void)

{

{

	struct am33xx_pm_platform_data *pdata;

	struct am33xx_pm_platform_data *pdata;

	struct platform_device_info devinfo;

	struct platform_device_info devinfo;
@@ -186,4 +186,6 @@ void __init amx3_common_pm_init(void) 
	devinfo.size_data = sizeof(*pdata);

	devinfo.size_data = sizeof(*pdata);

	devinfo.id = -1;

	devinfo.id = -1;

	platform_device_register_full(&devinfo);

	platform_device_register_full(&devinfo);



	return 0;

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE