linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] Input: ab8500-ponkey: Make the distinction between DT and non-DT boots
@ 2012-08-06 12:32 Lee Jones
  2012-08-06  8:19 ` Dmitry Torokhov
  2012-09-13  9:35 ` Linus Walleij
  0 siblings, 2 replies; 18+ messages in thread
From: Lee Jones @ 2012-08-06 12:32 UTC (permalink / raw)
  To: linux-arm-kernel, linux-kernel
  Cc: STEricsson_nomadik_linux, linus.walleij, arnd, dmitry.torokhov,
	linux-input, Lee Jones

If we're booting with Device Tree enabled, we want the IRQ numbers to
be taken and translated from the Device Tree binary. If not, they
should be taken from the resource allocation defined in the AB8500 MFD
core driver.

Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/input/misc/ab8500-ponkey.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 1a1d974..afcd87f 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -47,6 +47,7 @@ static irqreturn_t ab8500_ponkey_handler(int irq, void *data)
 static int __devinit ab8500_ponkey_probe(struct platform_device *pdev)
 {
 	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
+	struct device_node *np = pdev->dev.of_node;
 	struct ab8500_ponkey *ponkey;
 	struct input_dev *input;
 	int irq_dbf, irq_dbr;
@@ -73,8 +74,9 @@ static int __devinit ab8500_ponkey_probe(struct platform_device *pdev)
 
 	ponkey->idev = input;
 	ponkey->ab8500 = ab8500;
-	ponkey->irq_dbf = ab8500_irq_get_virq(ab8500, irq_dbf);
-	ponkey->irq_dbr = ab8500_irq_get_virq(ab8500, irq_dbr);
+
+	ponkey->irq_dbf = (np) ? ab8500_irq_get_virq(ab8500, irq_dbf) : irq_dbf;
+	ponkey->irq_dbr = (np) ? ab8500_irq_get_virq(ab8500, irq_dbr) : irq_dbr;
 
 	input->name = "AB8500 POn(PowerOn) Key";
 	input->dev.parent = &pdev->dev;
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2012-09-19 17:11 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-06 12:32 [PATCH 1/1] Input: ab8500-ponkey: Make the distinction between DT and non-DT boots Lee Jones
2012-08-06  8:19 ` Dmitry Torokhov
2012-08-06 15:37   ` Lee Jones
2012-08-06 16:02     ` Mark Brown
2012-08-06 17:24       ` Lee Jones
2012-08-07 17:01       ` Lee Jones
2012-08-07 17:03         ` Mark Brown
2012-08-08  7:35           ` Lee Jones
2012-08-08  8:04           ` Lee Jones
2012-08-08  8:28             ` Arnd Bergmann
2012-08-08  9:59               ` Mark Brown
2012-08-08  9:49             ` Mark Brown
2012-08-08 11:40               ` Lee Jones
2012-08-08 13:17                 ` Mark Brown
2012-09-13  9:35 ` Linus Walleij
2012-09-14  8:03   ` Lee Jones
2012-09-18 11:22     ` Linus Walleij
2012-09-19 17:11       ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).