From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>, <lejun.zhu@linux.intel.com>,
<bin.yang@intel.com>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>
Subject: [PATCH 1/3] mfd: intel_soc_pmic: Move PMIC interrupt comment to probe function
Date: Fri, 13 Feb 2015 15:01:13 +0200 [thread overview]
Message-ID: <1423832475-5803-1-git-send-email-jarkko.nikula@linux.intel.com> (raw)
intel_soc_pmic_find_gpio_irq() tries to find a GPIO interrupt but doesn't
select between it or I2C interrupt so it makes more sense to move this
comment to intel_soc_pmic_i2c_probe() with minor edits.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
drivers/mfd/intel_soc_pmic_core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
index df7b0642a5b4..08c8e3dafaf5 100644
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -26,11 +26,6 @@
#include <linux/mfd/intel_soc_pmic.h>
#include "intel_soc_pmic_core.h"
-/*
- * On some boards the PMIC interrupt may come from a GPIO line.
- * Try to lookup the ACPI table and see if such connection exists. If not,
- * return -ENOENT and use the IRQ provided by I2C.
- */
static int intel_soc_pmic_find_gpio_irq(struct device *dev)
{
struct gpio_desc *desc;
@@ -68,6 +63,11 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
pmic->regmap = devm_regmap_init_i2c(i2c, config->regmap_config);
+ /*
+ * On some boards the PMIC interrupt may come from a GPIO line. Try to
+ * lookup the ACPI table for a such connection and setup a GPIO
+ * interrupt if it exists. Otherwise use the IRQ provided by I2C
+ */
irq = intel_soc_pmic_find_gpio_irq(dev);
pmic->irq = (irq < 0) ? i2c->irq : irq;
--
2.1.4
next reply other threads:[~2015-02-13 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-13 13:01 Jarkko Nikula [this message]
2015-02-13 13:01 ` [PATCH 2/3] mfd: intel_soc_pmic: Do not mangle error code from devm_gpiod_get_index() Jarkko Nikula
2015-02-16 11:49 ` Lee Jones
2015-02-13 13:01 ` [PATCH 3/3] mfd: intel_soc_pmic: Ensure GPIO irq is set to input pin Jarkko Nikula
2015-02-16 11:49 ` Lee Jones
2015-02-16 11:49 ` [PATCH 1/3] mfd: intel_soc_pmic: Move PMIC interrupt comment to probe function Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423832475-5803-1-git-send-email-jarkko.nikula@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=bin.yang@intel.com \
--cc=lee.jones@linaro.org \
--cc=lejun.zhu@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox