ARM: OMAP2+: Remove legacy DSS initialization for omap4
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 7 Jun 2013 10:01:05 +0000 (13:01 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 28 Aug 2013 07:23:18 +0000 (10:23 +0300)
This is no longer needed as omap4 is now booted using device tree.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/dss-common.c
arch/arm/mach-omap2/dss-common.h

index 043e5705f2a60ce3c6ffecf70fad28be592ec214..00c049243d25372d27f66242fa0367593c7626e9 100644 (file)
@@ -80,24 +80,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = {
        .default_device = &omap4_panda_dvi_device,
 };
 
-void __init omap4_panda_display_init(void)
-{
-       omap_display_init(&omap4_panda_dss_data);
-
-       /*
-        * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
-        * later have external pull up on the HDMI I2C lines
-        */
-       if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
-               omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
-       else
-               omap_hdmi_init(0);
-
-       omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
-       omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
-       omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
-}
-
 void __init omap4_panda_display_init_of(void)
 {
        omap_display_init(&omap4_panda_dss_data);
@@ -204,35 +186,6 @@ static struct omap_dss_board_info sdp4430_dss_data = {
  * used by picodlp on the 4430sdp platform. Keep this gpio disabled as LCD2 is
  * selected by default
  */
-void __init omap_4430sdp_display_init(void)
-{
-       int r;
-
-       r = gpio_request_one(DISPLAY_SEL_GPIO, GPIOF_OUT_INIT_HIGH,
-                       "display_sel");
-       if (r)
-               pr_err("%s: Could not get display_sel GPIO\n", __func__);
-
-       r = gpio_request_one(DLP_POWER_ON_GPIO, GPIOF_OUT_INIT_LOW,
-               "DLP POWER ON");
-       if (r)
-               pr_err("%s: Could not get DLP POWER ON GPIO\n", __func__);
-
-       omap_display_init(&sdp4430_dss_data);
-       /*
-        * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
-        * later have external pull up on the HDMI I2C lines
-        */
-       if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
-               omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
-       else
-               omap_hdmi_init(0);
-
-       omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
-       omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
-       omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
-}
-
 void __init omap_4430sdp_display_init_of(void)
 {
        int r;
index 915f6fff5106d57b38bd0c16c2abb785a5b30c7e..c28fe3c035880c58ad6e749f123a01d4437024c8 100644 (file)
@@ -6,9 +6,7 @@
  * This file will be removed when DSS supports DT.
  */
 
-void __init omap4_panda_display_init(void);
 void __init omap4_panda_display_init_of(void);
-void __init omap_4430sdp_display_init(void);
 void __init omap_4430sdp_display_init_of(void);
 
 #endif