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

Commit 046bc575 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: fix DPI & DSI init order 



DPI may use DSI PLL, so it depends on DSI. However, currently DPI driver
is added first, which causes DPI initialization to fail when it tries to
get the DSI PLL.

This patch changes the init order to fix this.

A better solution would be to separate DSI PLL and DSI drivers. They
have dependencies, though, but we could still have DSI PLL as an
independent entity that we could initialize before any of the output
drivers.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 9296dbd7

drivers/video/omap2/dss/core.c

+6 −6
Original line number Diff line number Diff line
@@ -510,6 +510,9 @@ static int __init omap_dss_bus_register(void) 


/* INIT */

static int (*dss_output_drv_reg_funcs[])(void) __initdata = {

#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DPI

	dpi_init_platform_driver,

#endif
@@ -522,15 +525,15 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = { 
#ifdef CONFIG_OMAP2_DSS_VENC

	venc_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

	hdmi_init_platform_driver,

#endif

};



static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {

#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DPI

	dpi_uninit_platform_driver,

#endif
@@ -543,9 +546,6 @@ static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = { 
#ifdef CONFIG_OMAP2_DSS_VENC

	venc_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

	hdmi_uninit_platform_driver,

#endif