aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBibek Basu <bibek.basu@stericsson.com>2011-06-23 15:33:21 +0530
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:38 +0200
commit8f0470f17a88f8838b3e6c6b5028116e9f3baeed (patch)
treefed4c000a9a372a994afe803a96413986192b492
parent57b089b485e3696ce2df077e304b5d4060630e0c (diff)
downloadlinux-2.6.38-ux500-8f0470f17a88f8838b3e6c6b5028116e9f3baeed.tar.gz
U8500: change GPIO for SIM activity detection driver
This patch solves two things. One is to move to AB8500 GPIO for sim activity detection and another is to fix the missing return in driver probe. ST-Ericsson Linux next: 336280 ST-Ericsson ID: 349042 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Change-Id: Idd4c2b0877c9d8a1590b4e866efa61377963fb93 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25770 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c2
-rw-r--r--arch/arm/mach-ux500/include/mach/irqs-board-mop500.h2
-rw-r--r--drivers/misc/sim_detect.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d1467ea64c0..be1730bd765 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -654,7 +654,7 @@ static struct hsi_board_info __initdata u8500_hsi_devices[] = {
#ifdef CONFIG_U8500_SIM_DETECT
static struct sim_detect_platform_data sim_detect_pdata = {
- .irq_num = NOMADIK_GPIO_TO_IRQ(MOP500_AB8500_GPIO(12)),
+ .irq_num = NOMADIK_GPIO_TO_IRQ(MOP500_AB8500_GPIO(6)),
};
struct platform_device u8500_sim_detect_device = {
.name = "sim_detect",
diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
index 973bae33263..a58aa51fccf 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
@@ -43,6 +43,8 @@
#define MOP500_AB8500_VIR_GPIO_IRQ_BASE \
MOP500_STMPE1601_IRQ_END
+#define MOP500_AB8500_VIR_GPIO_IRQ(x) \
+ (MOP500_AB8500_VIR_GPIO_IRQ_BASE + (x))
#define MOP500_AB8500_VIR_GPIO_IRQ_END \
(MOP500_AB8500_VIR_GPIO_IRQ_BASE + AB8500_VIR_GPIO_NR_IRQS)
diff --git a/drivers/misc/sim_detect.c b/drivers/misc/sim_detect.c
index 24862edfca7..c267fe95ee3 100644
--- a/drivers/misc/sim_detect.c
+++ b/drivers/misc/sim_detect.c
@@ -115,6 +115,7 @@ static int __devinit sim_detect_probe(struct platform_device *pdev)
"sim activity", sim_detect);
if (ret < 0)
goto out_free_irq;
+ return 0;
out_free_irq:
modem_put(sim_detect->modem);
platform_set_drvdata(pdev, NULL);