Commit ee9dfd82 authored by Mythri P K's avatar Mythri P K Committed by Tomi Valkeinen
Browse files

OMAPDSS: HDMI: Move duplicate code from boardfile 



Move duplicate HDMI mux_init code from omap4 and panda board file
to display file.

Signed-off-by: default avatarMythri P K <mythripk@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 6acea9c2

arch/arm/mach-omap2/board-4430sdp.c

+1 −15
Original line number Diff line number Diff line
@@ -595,20 +595,6 @@ static void __init omap_sfh7741prox_init(void) 
			__func__, OMAP4_SFH7741_ENABLE_GPIO, error);

}



static void sdp4430_hdmi_mux_init(void)

{

	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */

	omap_mux_init_signal("hdmi_hpd",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_cec",

			OMAP_PIN_INPUT_PULLUP);

	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */

	omap_mux_init_signal("hdmi_ddc_scl",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_sda",

			OMAP_PIN_INPUT_PULLUP);

}



static struct gpio sdp4430_hdmi_gpios[] = {

	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_hpd"   },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },
@@ -826,9 +812,9 @@ static void omap_4430sdp_display_init(void) 
		pr_err("%s: Could not get display_sel GPIO\n", __func__);



	sdp4430_lcd_init();

	sdp4430_hdmi_mux_init();

	sdp4430_picodlp_init();

	omap_display_init(&sdp4430_dss_data);

	omap_hdmi_init();

}



#ifdef CONFIG_OMAP_MUX

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

+1 −16
Original line number Diff line number Diff line
@@ -478,21 +478,6 @@ int __init omap4_panda_dvi_init(void) 
	return r;

}





static void omap4_panda_hdmi_mux_init(void)

{

	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */

	omap_mux_init_signal("hdmi_hpd",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_cec",

			OMAP_PIN_INPUT_PULLUP);

	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */

	omap_mux_init_signal("hdmi_ddc_scl",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_sda",

			OMAP_PIN_INPUT_PULLUP);

}



static struct gpio panda_hdmi_gpios[] = {

	{ HDMI_GPIO_HPD,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
@@ -544,8 +529,8 @@ void omap4_panda_display_init(void) 
	if (r)

		pr_err("error initializing panda DVI\n");



	omap4_panda_hdmi_mux_init();

	omap_display_init(&omap4_panda_dss_data);

	omap_hdmi_init();

}



static void __init omap4_panda_init(void)

arch/arm/mach-omap2/display.c

+23 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <plat/omap-pm.h>

#include <plat/common.h>



#include "mux.h"

#include "control.h"

#include "display.h"
@@ -96,6 +97,20 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { 
	{ "dss_hdmi", "omapdss_hdmi", -1 },

};



static void omap4_hdmi_mux_pads()

{

	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */

	omap_mux_init_signal("hdmi_hpd",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_cec",

			OMAP_PIN_INPUT_PULLUP);

	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */

	omap_mux_init_signal("hdmi_ddc_scl",

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_sda",

			OMAP_PIN_INPUT_PULLUP);

}



static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)

{

	u32 enable_mask, enable_shift;
@@ -129,6 +144,14 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) 
	return 0;

}



int omap_hdmi_init(void)

{

	if (cpu_is_omap44xx())

		omap4_hdmi_mux_pads();



	return 0;

}



static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)

{

	if (cpu_is_omap44xx())

include/video/omapdss.h

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ struct omap_dss_board_info { 


/* Init with the board info */

extern int omap_display_init(struct omap_dss_board_info *board_data);

/* HDMI mux init*/

extern int omap_hdmi_init(void);



struct omap_display_platform_data {

	struct omap_dss_board_info *board_data;