aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorwzedlare <vedatak01@gmail.com>2017-06-18 16:38:26 +0000
committerwzedlare <vedatak01@gmail.com>2017-06-19 16:57:11 +0000
commitc7d4e3fd588e3ba3d3fa4d5cfa224aa54bc288bf (patch)
treeb8b64cb9deb6832c1e41f58f0f143514beafc709 /drivers/gpio
parent28c99c87b881bb664c44bb26e80a681f87d54e60 (diff)
p2a42: Import fully working kernel sourceHEADn7.1
Change-Id: Ia4c94f09e29843b1af34d466243378a357e97b70
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-msm-smp2p.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-msm-smp2p.c b/drivers/gpio/gpio-msm-smp2p.c
index bde81f04..2675c126 100644
--- a/drivers/gpio/gpio-msm-smp2p.c
+++ b/drivers/gpio/gpio-msm-smp2p.c
@@ -1,6 +1,6 @@
/* drivers/gpio/gpio-msm-smp2p.c
*
- * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -368,7 +368,7 @@ static int smp2p_irq_map(struct irq_domain *domain_ptr, unsigned int virq,
chip = domain_ptr->host_data;
if (!chip) {
- SMP2P_ERR("%s: invalid domain ptr %p\n", __func__, domain_ptr);
+ SMP2P_ERR("%s: invalid domain ptr\n", __func__);
return -ENODEV;
}
@@ -407,6 +407,11 @@ static const struct irq_domain_ops smp2p_irq_domain_ops = {
static void msm_summary_irq_handler(struct smp2p_chip_dev *chip,
struct msm_smp2p_update_notif *entry)
{
+ //chenyb1, 20130619, Add log to show gpio wakeup interrupts begin
+ #ifdef CONFIG_LENOVO_PM_LOG
+ extern int save_irq_wakeup_gpio(int irq, int gpio);
+ #endif //#ifdef CONFIG_LENOVO_PM_LOG
+ //chenyb1, 20130619, Add log to show gpio wakeup interrupts end
int i;
uint32_t cur_val;
uint32_t prev_val;
@@ -458,6 +463,11 @@ static void msm_summary_irq_handler(struct smp2p_chip_dev *chip,
edge_name_rising[irq_rising],
edge_name_falling[irq_falling],
edge_names[edge]);
+ //chenyb1, 20130619, Add log to show gpio wakeup interrupts begin
+ #ifdef CONFIG_LENOVO_PM_LOG
+ save_irq_wakeup_gpio(chip->irq_base + i, i);
+ #endif //#ifdef CONFIG_LENOVO_PM_LOG
+ //chenyb1, 20130619, Add log to show gpio wakeup interrupts end
(void)generic_handle_irq(chip->irq_base + i);
}