aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2010-06-14 15:16:12 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:35 -0600
commitb714b528a3b818ed0dc1cadc07b55296621b8039 (patch)
tree8b7b41b9ae5735e9e58b72f865a92ebbf0ef2f29 /arch
parent7df9c36efd4acb8b2965ba8b7f0305ffabb13a2f (diff)
downloadlinux-2.6.34-ux500-b714b528a3b818ed0dc1cadc07b55296621b8039.tar.gz
fix WARN_ON() in gpio_lib.c for v2.6.34 request gpios before using them.
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: If955add089a534671c9bbfb858958c521281d435 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2412 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-ux500/board-mop500.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index be675a34473..923571c8e07 100755
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -504,9 +504,19 @@ static int bu21013_gpio_board_init(int reset_pin)
writel(TSC_EXT_CLOCK_9_6MHZ, clk_base);
}
if (platform_id == MOP500_PLATFORM_ID) {
+ retval = gpio_request(EGPIO_PIN_2, "touchp_egpio2");
+ if (retval) {
+ printk(KERN_ERR "Unable to request gpio EGPIO_PIN_2");
+ return retval;
+ }
gpio_set_value(EGPIO_PIN_2, 1);
} else if (platform_id == HREF_PLATFORM_ID) {
if (!config_set) {
+ retval = gpio_request(reset_pin, "touchp_reset");
+ if (retval) {
+ printk(KERN_ERR "Unable to request gpio reset_pin");
+ return retval;
+ }
retval = gpio_direction_output(reset_pin, 1);
if (retval < 0) {
printk(KERN_ERR "%s: gpio direction failed\n", __func__);