* mythripk@xxxxxx <mythripk@xxxxxx> [111111 04:41]: > From: Mythri P K <mythripk@xxxxxx> > > Move duplicate HDMI mux_init code from omap4 and panda board file > to display file. > > Signed-off-by: Mythri P K <mythripk@xxxxxx> > --- > arch/arm/mach-omap2/board-4430sdp.c | 16 +--------------- > arch/arm/mach-omap2/board-omap4panda.c | 17 +---------------- > arch/arm/mach-omap2/display.c | 23 +++++++++++++++++++++++ > include/video/omapdss.h | 2 ++ > 4 files changed, 27 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c > index 73b1e99..4a519a3 100644 > --- a/arch/arm/mach-omap2/board-4430sdp.c > +++ b/arch/arm/mach-omap2/board-4430sdp.c > @@ -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" }, > @@ -838,9 +824,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_enable_pads(); > } Good to see some removal of the code here :) Maybe call the fuction omap_hdmi_init() instead? That way you can make it more generic and pass it some options. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html