diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-17 06:30:27 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 03:51:04 -0400 |
commit | e813a55eb9c9bc6c8039fb16332cf43402125b30 (patch) | |
tree | 18b4450d21ba7755587d442865142f641fee3f14 /arch/arm/mach-omap2/board-cm-t35.c | |
parent | 2da35193dc81b574001a47347f41c4922b1266d3 (diff) |
OMAP: board-files: remove custom PD GPIO handling for DVI output
Now that the panel-dvi driver handles the PD (power-down) GPIO, we can
remove the custom PD handling from the board files.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 909a8b91b564..6f790262515c 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -218,25 +218,6 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev) | |||
218 | gpio_set_value(CM_T35_LCD_EN_GPIO, 0); | 218 | gpio_set_value(CM_T35_LCD_EN_GPIO, 0); |
219 | } | 219 | } |
220 | 220 | ||
221 | static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev) | ||
222 | { | ||
223 | if (lcd_enabled) { | ||
224 | printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); | ||
225 | return -EINVAL; | ||
226 | } | ||
227 | |||
228 | gpio_set_value(CM_T35_DVI_EN_GPIO, 0); | ||
229 | dvi_enabled = 1; | ||
230 | |||
231 | return 0; | ||
232 | } | ||
233 | |||
234 | static void cm_t35_panel_disable_dvi(struct omap_dss_device *dssdev) | ||
235 | { | ||
236 | gpio_set_value(CM_T35_DVI_EN_GPIO, 1); | ||
237 | dvi_enabled = 0; | ||
238 | } | ||
239 | |||
240 | static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev) | 221 | static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev) |
241 | { | 222 | { |
242 | return 0; | 223 | return 0; |
@@ -261,8 +242,7 @@ static struct omap_dss_device cm_t35_lcd_device = { | |||
261 | }; | 242 | }; |
262 | 243 | ||
263 | static struct panel_dvi_platform_data dvi_panel = { | 244 | static struct panel_dvi_platform_data dvi_panel = { |
264 | .platform_enable = cm_t35_panel_enable_dvi, | 245 | .power_down_gpio = CM_T35_DVI_EN_GPIO, |
265 | .platform_disable = cm_t35_panel_disable_dvi, | ||
266 | }; | 246 | }; |
267 | 247 | ||
268 | static struct omap_dss_device cm_t35_dvi_device = { | 248 | static struct omap_dss_device cm_t35_dvi_device = { |
@@ -316,7 +296,6 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = { | |||
316 | static struct gpio cm_t35_dss_gpios[] __initdata = { | 296 | static struct gpio cm_t35_dss_gpios[] __initdata = { |
317 | { CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW, "lcd enable" }, | 297 | { CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW, "lcd enable" }, |
318 | { CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW, "lcd bl enable" }, | 298 | { CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW, "lcd bl enable" }, |
319 | { CM_T35_DVI_EN_GPIO, GPIOF_OUT_INIT_HIGH, "dvi enable" }, | ||
320 | }; | 299 | }; |
321 | 300 | ||
322 | static void __init cm_t35_init_display(void) | 301 | static void __init cm_t35_init_display(void) |
@@ -335,7 +314,6 @@ static void __init cm_t35_init_display(void) | |||
335 | 314 | ||
336 | gpio_export(CM_T35_LCD_EN_GPIO, 0); | 315 | gpio_export(CM_T35_LCD_EN_GPIO, 0); |
337 | gpio_export(CM_T35_LCD_BL_GPIO, 0); | 316 | gpio_export(CM_T35_LCD_BL_GPIO, 0); |
338 | gpio_export(CM_T35_DVI_EN_GPIO, 0); | ||
339 | 317 | ||
340 | msleep(50); | 318 | msleep(50); |
341 | gpio_set_value(CM_T35_LCD_EN_GPIO, 1); | 319 | gpio_set_value(CM_T35_LCD_EN_GPIO, 1); |