Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271432
b: refs/heads/master
c: 870e1a7
h: refs/heads/master
v: v3
  • Loading branch information
Tomi Valkeinen committed Sep 30, 2011
1 parent 7c35b93 commit d59476a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d7a8654e88885137ade1769c574467775fde27b
refs/heads/master: 870e1a73596244b22a56f69fe4b24458b38ce94b
34 changes: 0 additions & 34 deletions trunk/arch/arm/mach-omap2/board-omap3stalker.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,39 +108,6 @@ static void __init omap3_stalker_display_init(void)
return;
}

static int omap3_stalker_enable_lcd(struct omap_dss_device *dssdev)
{
if (dvi_enabled) {
printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
return -EINVAL;
}
gpio_set_value(DSS_ENABLE_GPIO, 1);
gpio_set_value(LCD_PANEL_BKLIGHT_GPIO, 1);
lcd_enabled = 1;
return 0;
}

static void omap3_stalker_disable_lcd(struct omap_dss_device *dssdev)
{
gpio_set_value(DSS_ENABLE_GPIO, 0);
gpio_set_value(LCD_PANEL_BKLIGHT_GPIO, 0);
lcd_enabled = 0;
}

static struct panel_generic_dpi_data lcd_panel = {
.name = "generic",
.platform_enable = omap3_stalker_enable_lcd,
.platform_disable = omap3_stalker_disable_lcd,
};

static struct omap_dss_device omap3_stalker_lcd_device = {
.name = "lcd",
.driver_name = "generic_dpi_panel",
.data = &lcd_panel,
.phy.dpi.data_lines = 24,
.type = OMAP_DISPLAY_TYPE_DPI,
};

static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev)
{
return 0;
Expand Down Expand Up @@ -194,7 +161,6 @@ static struct omap_dss_device omap3_stalker_dvi_device = {
};

static struct omap_dss_device *omap3_stalker_dss_devices[] = {
&omap3_stalker_lcd_device,
&omap3_stalker_tv_device,
&omap3_stalker_dvi_device,
};
Expand Down

0 comments on commit d59476a

Please sign in to comment.