From: Vaibhav Hiremath <[email protected]>

Since access to TWL GPIO's can go into sleep, and using normal
gpio_get/set_value() API will lead to kernel dump (of WARN_ON()).

On OMAP3EVM LCD backlight & DVI encoder is controller through
TWL GPIO, so replacing normal gpio_get/set_value() to
gpio_get_set_value_cansleep().

Signed-off-by: Vaibhav Hiremath <[email protected]>
---
 arch/arm/mach-omap2/board-omap3evm.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
b/arch/arm/mach-omap2/board-omap3evm.c
index adfb7ad..633c89e 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -234,9 +234,9 @@ static int omap3_evm_enable_lcd(struct omap_dss_device 
*dssdev)
        gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 0);

        if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
-               gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+               gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
        else
-               gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+               gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);

        lcd_enabled = 1;
        return 0;
@@ -247,9 +247,9 @@ static void omap3_evm_disable_lcd(struct omap_dss_device 
*dssdev)
        gpio_set_value(OMAP3EVM_LCD_PANEL_ENVDD, 1);

        if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2)
-               gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
+               gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1);
        else
-               gpio_set_value(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);
+               gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 0);

        lcd_enabled = 0;
 }
@@ -288,7 +288,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device 
*dssdev)
                return -EINVAL;
        }

-       gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);
+       gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 1);

        dvi_enabled = 1;
        return 0;
@@ -296,7 +296,7 @@ static int omap3_evm_enable_dvi(struct omap_dss_device 
*dssdev)

 static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
 {
-       gpio_set_value(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);
+       gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 0);

        dvi_enabled = 0;
 }
--
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to