1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 3053399faf9a..2ce9992f403b 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -912,6 +912,15 @@ static int taal_probe(struct omap_dss_device *dssdev)
 
         dev_set_drvdata(&dssdev->dev, td);
 
+        if (gpio_is_valid(panel_data->reset_gpio)) {
+                r = gpio_request_one(panel_data->reset_gpio, GPIOF_OUT_INIT_LOW,
+                                "taal rst");
+                if (r) {
+                        dev_err(&dssdev->dev, "failed to request reset gpio\n");
+                        goto err_rst_gpio;
+                }
+        }
+
         taal_hw_reset(dssdev);
 
         if (panel_data->use_dsi_backlight) {
@@ -992,6 +1001,9 @@ err_gpio:
         if (bldev != NULL)
                 backlight_device_unregister(bldev);
 err_bl:
+        if (gpio_is_valid(panel_data->reset_gpio))
+                gpio_free(panel_data->reset_gpio);
+err_rst_gpio:
         destroy_workqueue(td->workqueue);
 err_wq:
         kfree(td);
@@ -1030,15 +1042,25 @@ static void __exit taal_remove(struct omap_dss_device *dssdev)
         /* reset, to be sure that the panel is in a valid state */
         taal_hw_reset(dssdev);
 
+        if (gpio_is_valid(panel_data->reset_gpio))
+                gpio_free(panel_data->reset_gpio);
+
         kfree(td);
 }
 
 static int taal_power_on(struct omap_dss_device *dssdev)
 {
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev);
         u8 id1, id2, id3;
         int r;
 
+        r = omapdss_dsi_configure_pins(dssdev, &panel_data->pin_config);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to configure DSI pins\n");
+                goto err0;
+        };
+
         r = omapdss_dsi_display_enable(dssdev);
         if (r) {
                 dev_err(&dssdev->dev, "failed to enable DSI\n");