diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 03cb97e3319b..a86d00105d59 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -134,11 +134,15 @@ static int devkit8000_panel_enable_lcd(struct omap_dss_device *dssdev) | |||
134 | twl_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, REG_GPIODATADIR1); | 134 | twl_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, REG_GPIODATADIR1); |
135 | twl_i2c_write_u8(TWL4030_MODULE_LED, 0x0, 0x0); | 135 | twl_i2c_write_u8(TWL4030_MODULE_LED, 0x0, 0x0); |
136 | 136 | ||
137 | if (dssdev->reset_gpio != -EINVAL) | ||
138 | gpio_set_value(dssdev->reset_gpio, 1); | ||
137 | return 0; | 139 | return 0; |
138 | } | 140 | } |
139 | 141 | ||
140 | static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev) | 142 | static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev) |
141 | { | 143 | { |
144 | if (dssdev->reset_gpio != -EINVAL) | ||
145 | gpio_set_value(dssdev->reset_gpio, 0); | ||
142 | } | 146 | } |
143 | 147 | ||
144 | static int devkit8000_panel_enable_dvi(struct omap_dss_device *dssdev) | 148 | static int devkit8000_panel_enable_dvi(struct omap_dss_device *dssdev) |
@@ -183,6 +187,7 @@ static struct omap_dss_device devkit8000_lcd_device = { | |||
183 | .driver_name = "generic_panel", | 187 | .driver_name = "generic_panel", |
184 | .type = OMAP_DISPLAY_TYPE_DPI, | 188 | .type = OMAP_DISPLAY_TYPE_DPI, |
185 | .phy.dpi.data_lines = 24, | 189 | .phy.dpi.data_lines = 24, |
190 | .reset_gpio = -EINVAL, /* will be replaced */ | ||
186 | .platform_enable = devkit8000_panel_enable_lcd, | 191 | .platform_enable = devkit8000_panel_enable_lcd, |
187 | .platform_disable = devkit8000_panel_disable_lcd, | 192 | .platform_disable = devkit8000_panel_disable_lcd, |
188 | }; | 193 | }; |
@@ -281,6 +286,12 @@ static int devkit8000_twl_gpio_setup(struct device *dev, | |||
281 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ | 286 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ |
282 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | 287 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; |
283 | 288 | ||
289 | /* gpio + 1 is "LCD_PWREN" (out, active high) */ | ||
290 | devkit8000_lcd_device.reset_gpio = gpio + 1; | ||
291 | gpio_request(devkit8000_lcd_device.reset_gpio, "LCD_PWREN"); | ||
292 | /* Disable until needed */ | ||
293 | gpio_direction_output(devkit8000_lcd_device.reset_gpio, 0); | ||
294 | |||
284 | /* gpio + 7 is "DVI_PD" (out, active low) */ | 295 | /* gpio + 7 is "DVI_PD" (out, active low) */ |
285 | devkit8000_dvi_device.reset_gpio = gpio + 7; | 296 | devkit8000_dvi_device.reset_gpio = gpio + 7; |
286 | gpio_request(devkit8000_dvi_device.reset_gpio, "DVI PowerDown"); | 297 | gpio_request(devkit8000_dvi_device.reset_gpio, "DVI PowerDown"); |