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

Commit e8a30b25 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Remove __init from DSI mux functions 



Commit d1589f09 (ARM: OMAP2+: Mark
omap_hsmmc_init and omap_mux related functions as __init) changed DSI
muxing functions to __init. This doesn't work, as the muxing functions
are used every time a DSI display is enabled or disabled.

This patch removes the __inits from DSI mux functions that were
accidentally marked as __init, and makes omap4_hdmi_mux_pads __init
like it should be.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
[tony@atomide.com: update comments, mark omap4_hdmi_mux_pads __init]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4647ca57

arch/arm/mach-omap2/display.c

+4 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { 
	{ "dss_hdmi", "omapdss_hdmi", -1 },

};



static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)

static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)

{

	u32 reg;

	u16 control_i2c_1;
@@ -124,7 +124,7 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) 
	}

}



static int __init omap4_dsi_mux_pads(int dsi_id, unsigned lanes)

static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)

{

	u32 enable_mask, enable_shift;

	u32 pipd_mask, pipd_shift;
@@ -165,7 +165,7 @@ int __init omap_hdmi_init(enum omap_hdmi_flags flags) 
	return 0;

}



static int __init omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)

static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)

{

	if (cpu_is_omap44xx())

		return omap4_dsi_mux_pads(dsi_id, lane_mask);
@@ -173,7 +173,7 @@ static int __init omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) 
	return 0;

}



static void __init omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)

static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)

{

	if (cpu_is_omap44xx())

		omap4_dsi_mux_pads(dsi_id, 0);