Skip to content

Commit

Permalink
ARM: OMAP2+: remove pdata quirks for displays
Browse files Browse the repository at this point in the history
Remove pdata quirks for the displays on boards that are now supported
properly with DT.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
tomba committed Apr 4, 2014
1 parent 931d4bd commit b4f8892
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 243 deletions.
240 changes: 0 additions & 240 deletions arch/arm/mach-omap2/dss-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,243 +35,3 @@
#include "mux.h"
#include "display.h"

#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
#define HDMI_GPIO_HPD 63 /* Hotplug detect */

#define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0

/* DVI Connector */
static struct connector_dvi_platform_data omap4_panda_dvi_connector_pdata = {
.name = "dvi",
.source = "tfp410.0",
.i2c_bus_num = 2,
};

static struct platform_device omap4_panda_dvi_connector_device = {
.name = "connector-dvi",
.id = 0,
.dev.platform_data = &omap4_panda_dvi_connector_pdata,
};

/* TFP410 DPI-to-DVI chip */
static struct encoder_tfp410_platform_data omap4_panda_tfp410_pdata = {
.name = "tfp410.0",
.source = "dpi.0",
.data_lines = 24,
.power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
};

static struct platform_device omap4_panda_tfp410_device = {
.name = "tfp410",
.id = 0,
.dev.platform_data = &omap4_panda_tfp410_pdata,
};

/* HDMI Connector */
static struct connector_hdmi_platform_data omap4_panda_hdmi_connector_pdata = {
.name = "hdmi",
.source = "tpd12s015.0",
};

static struct platform_device omap4_panda_hdmi_connector_device = {
.name = "connector-hdmi",
.id = 0,
.dev.platform_data = &omap4_panda_hdmi_connector_pdata,
};

/* TPD12S015 HDMI ESD protection & level shifter chip */
static struct encoder_tpd12s015_platform_data omap4_panda_tpd_pdata = {
.name = "tpd12s015.0",
.source = "hdmi.0",

.ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
.ls_oe_gpio = HDMI_GPIO_LS_OE,
.hpd_gpio = HDMI_GPIO_HPD,
};

static struct platform_device omap4_panda_tpd_device = {
.name = "tpd12s015",
.id = 0,
.dev.platform_data = &omap4_panda_tpd_pdata,
};

static struct omap_dss_board_info omap4_panda_dss_data = {
.default_display_name = "dvi",
};

void __init omap4_panda_display_init_of(void)
{
struct device_node *node;

node = omapdss_find_dss_of_node();
if (node && of_device_is_available(node))
return;

omap_display_init(&omap4_panda_dss_data);

platform_device_register(&omap4_panda_tfp410_device);
platform_device_register(&omap4_panda_dvi_connector_device);

platform_device_register(&omap4_panda_tpd_device);
platform_device_register(&omap4_panda_hdmi_connector_device);
}


/* OMAP4 Blaze display data */

#define DISPLAY_SEL_GPIO 59 /* LCD2/PicoDLP switch */
#define DLP_POWER_ON_GPIO 40

static struct panel_dsicm_platform_data dsi1_panel = {
.name = "lcd",
.source = "dsi.0",
.reset_gpio = 102,
.use_ext_te = false,
.ext_te_gpio = 101,
.pin_config = {
.num_pins = 6,
.pins = { 0, 1, 2, 3, 4, 5 },
},
};

static struct platform_device sdp4430_lcd_device = {
.name = "panel-dsi-cm",
.id = 0,
.dev.platform_data = &dsi1_panel,
};

static struct panel_dsicm_platform_data dsi2_panel = {
.name = "lcd2",
.source = "dsi.1",
.reset_gpio = 104,
.use_ext_te = false,
.ext_te_gpio = 103,
.pin_config = {
.num_pins = 6,
.pins = { 0, 1, 2, 3, 4, 5 },
},
};

static struct platform_device sdp4430_lcd2_device = {
.name = "panel-dsi-cm",
.id = 1,
.dev.platform_data = &dsi2_panel,
};

/* HDMI Connector */
static struct connector_hdmi_platform_data sdp4430_hdmi_connector_pdata = {
.name = "hdmi",
.source = "tpd12s015.0",
};

static struct platform_device sdp4430_hdmi_connector_device = {
.name = "connector-hdmi",
.id = 0,
.dev.platform_data = &sdp4430_hdmi_connector_pdata,
};

/* TPD12S015 HDMI ESD protection & level shifter chip */
static struct encoder_tpd12s015_platform_data sdp4430_tpd_pdata = {
.name = "tpd12s015.0",
.source = "hdmi.0",

.ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
.ls_oe_gpio = HDMI_GPIO_LS_OE,
.hpd_gpio = HDMI_GPIO_HPD,
};

static struct platform_device sdp4430_tpd_device = {
.name = "tpd12s015",
.id = 0,
.dev.platform_data = &sdp4430_tpd_pdata,
};


static struct omap_dss_board_info sdp4430_dss_data = {
.default_display_name = "lcd",
};

/*
* we select LCD2 by default (instead of Pico DLP) by setting DISPLAY_SEL_GPIO.
* Setting DLP_POWER_ON gpio enables the VDLP_2V5 VDLP_1V8 and VDLP_1V0 rails
* used by picodlp on the 4430sdp platform. Keep this gpio disabled as LCD2 is
* selected by default
*/
void __init omap_4430sdp_display_init_of(void)
{
int r;
struct device_node *node;

node = omapdss_find_dss_of_node();
if (node && of_device_is_available(node))
return;

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);

platform_device_register(&sdp4430_lcd_device);
platform_device_register(&sdp4430_lcd2_device);

platform_device_register(&sdp4430_tpd_device);
platform_device_register(&sdp4430_hdmi_connector_device);
}


/* OMAP3 IGEPv2 data */

#define IGEP2_DVI_TFP410_POWER_DOWN_GPIO 170

/* DVI Connector */
static struct connector_dvi_platform_data omap3_igep2_dvi_connector_pdata = {
.name = "dvi",
.source = "tfp410.0",
.i2c_bus_num = 2,
};

static struct platform_device omap3_igep2_dvi_connector_device = {
.name = "connector-dvi",
.id = 0,
.dev.platform_data = &omap3_igep2_dvi_connector_pdata,
};

/* TFP410 DPI-to-DVI chip */
static struct encoder_tfp410_platform_data omap3_igep2_tfp410_pdata = {
.name = "tfp410.0",
.source = "dpi.0",
.data_lines = 24,
.power_down_gpio = IGEP2_DVI_TFP410_POWER_DOWN_GPIO,
};

static struct platform_device omap3_igep2_tfp410_device = {
.name = "tfp410",
.id = 0,
.dev.platform_data = &omap3_igep2_tfp410_pdata,
};

static struct omap_dss_board_info igep2_dss_data = {
.default_display_name = "dvi",
};

void __init omap3_igep2_display_init_of(void)
{
struct device_node *node;

node = omapdss_find_dss_of_node();
if (node && of_device_is_available(node))
return;

omap_display_init(&igep2_dss_data);

platform_device_register(&omap3_igep2_tfp410_device);
platform_device_register(&omap3_igep2_dvi_connector_device);
}
3 changes: 0 additions & 3 deletions arch/arm/mach-omap2/pdata-quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ static void __init omap3_sbc_t3530_legacy_init(void)

static void __init omap3_igep0020_legacy_init(void)
{
omap3_igep2_display_init_of();
}

static void __init omap3_evm_legacy_init(void)
Expand Down Expand Up @@ -229,14 +228,12 @@ static void __init am3517_evm_legacy_init(void)
#ifdef CONFIG_ARCH_OMAP4
static void __init omap4_sdp_legacy_init(void)
{
omap_4430sdp_display_init_of();
legacy_init_wl12xx(WL12XX_REFCLOCK_26,
WL12XX_TCXOCLOCK_26, 53);
}

static void __init omap4_panda_legacy_init(void)
{
omap4_panda_display_init_of();
legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
}
#endif
Expand Down

0 comments on commit b4f8892

Please sign in to comment.