linux-kernel - [PATCH 3/6] mfd: max77686: Allow to specify interrupt through DT or platform file also.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu,  5 Jul 2012 09:28:22 +0530
From:	Yadwinder Singh Brar <yadi.brar01@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	sameo@...ux.intel.com,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>,
	Jonghwa Lee <jonghwa3.lee@...sung.com>,
	Myungjoo Ham <myungjoo.ham@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Chiwoong Byun <woong.byun@...sung.com>,
	Yadwinder Singh Brar <yadi.brar@...sung.com>
Subject: [PATCH 3/6] mfd: max77686: Allow to specify interrupt through DT or platform file also.

Presently driver expects irq_gpio pin in platform data and maps it to irq
itself. But we can also directly specify the interrupt in DT or platform file.

Signed-off-by: Yadwinder Singh Brar <yadi.brar@...sung.com>
---
 drivers/mfd/max77686-irq.c |   33 ++++++++++++++++++++-------------
 drivers/mfd/max77686.c     |    1 +
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/drivers/mfd/max77686-irq.c b/drivers/mfd/max77686-irq.c
index 0758fac..1fbbc64 100644
--- a/drivers/mfd/max77686-irq.c
+++ b/drivers/mfd/max77686-irq.c
@@ -252,21 +252,28 @@ int max77686_irq_init(struct max77686_dev *max77686)
 
 	mutex_init(&max77686->irqlock);
 
-	max77686->irq = gpio_to_irq(max77686->irq_gpio);
-
-	if (debug_mask & MAX77686_DEBUG_IRQ_INT) {
-		ret = gpio_request(max77686->irq_gpio, "pmic_irq");
-		if (ret < 0) {
-			dev_err(max77686->dev,
-				"Failed to request gpio %d with ret: %d\n",
-				max77686->irq_gpio, ret);
-			return IRQ_NONE;
+	if (max77686->irq_gpio && !max77686->irq) {
+		max77686->irq = gpio_to_irq(max77686->irq_gpio);
+
+		if (debug_mask & MAX77686_DEBUG_IRQ_INT) {
+			ret = gpio_request(max77686->irq_gpio, "pmic_irq");
+			if (ret < 0) {
+				dev_err(max77686->dev,
+					"Failed to request gpio %d with ret:"
+					"%d\n",	max77686->irq_gpio, ret);
+				return IRQ_NONE;
+			}
+
+			gpio_direction_input(max77686->irq_gpio);
+			val = gpio_get_value(max77686->irq_gpio);
+			gpio_free(max77686->irq_gpio);
+			pr_info("%s: gpio_irq=%x\n", __func__, val);
 		}
+	}
 
-		gpio_direction_input(max77686->irq_gpio);
-		val = gpio_get_value(max77686->irq_gpio);
-		gpio_free(max77686->irq_gpio);
-		pr_info("%s: gpio_irq=%x\n", __func__, val);
+	if (!max77686->irq) {
+		dev_err(max77686->dev, "irq is not specified\n");
+		return -ENODEV;
 	}
 
 	/* Mask individual interrupt sources */
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 11e5601..5c78e94 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -78,6 +78,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 
 	max77686->wakeup = pdata->wakeup;
 	max77686->irq_gpio = pdata->irq_gpio;
+	max77686->irq = i2c->irq;
 
 	mutex_init(&max77686->iolock);
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/