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

Commit 463ab4d5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Make display related init into device_initcall 



We can initialize almost everything at normal module_init time with
ti-sysc except for clocks and timers. To prepare for that, let's make
display init into device_initcall as otherwise we'll be calling
of_platform_populate() before the parent has probed.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 02b83dcb

arch/arm/mach-omap2/board-generic.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ static const struct of_device_id omap_dt_match_table[] __initconst = { 
static void __init __maybe_unused omap_generic_init(void)

{

	pdata_quirks_init(omap_dt_match_table);



	omapdss_init_of();

	omap_soc_device_init();

}

arch/arm/mach-omap2/common.h

+0 −2
Original line number Diff line number Diff line
@@ -352,7 +352,5 @@ extern int omap_dss_reset(struct omap_hwmod *); 
/* SoC specific clock initializer */

int omap_clk_init(void);



int __init omapdss_init_of(void);



#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/mach-omap2/display.c

+2 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static struct device_node * __init omapdss_find_dss_of_node(void) 
	return NULL;

}



int __init omapdss_init_of(void)

static int __init omapdss_init_of(void)

{

	int r;

	struct device_node *node;
@@ -415,3 +415,4 @@ int __init omapdss_init_of(void) 


	return omapdss_init_fbdev();

}

omap_device_initcall(omapdss_init_of);