Skip to contentSkip to conversation

mfd: intel_soc_pmic: Move PMIC interrupt comment to probe function

PATCH Applied Jarkko Nikula 2 participants 6 messages Feb 13, 2015 – Feb 16, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 mfd: intel_soc_pmic: Move PMIC interrupt comment to probe function

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.

---
 drivers/mfd/intel_soc_pmic_core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/intel_soc_pmic_core.c +5 -5
index df7b0642a5b4..08c8e3dafaf5 100644
@@ -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;
 
Signature · 1 line
2.1.4
#1 lore raw

PATCH 2/3 mfd: intel_soc_pmic: Do not mangle error code from devm_gpiod_get_index()

It is usually better to pass actual error code from a function call than mangling it to another.

---
I haven't seen any issue with this. Random observation by looking at the code.

---
 drivers/mfd/intel_soc_pmic_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/intel_soc_pmic_core.c +1 -1
index 08c8e3dafaf5..40488e5b52ef 100644
@@ -33,7 +33,7 @@ static int intel_soc_pmic_find_gpio_irq(struct device *dev)
 
 	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0);
 	if (IS_ERR(desc))
-		return -ENOENT;
+		return PTR_ERR(desc);
 
 	irq = gpiod_to_irq(desc);
 	if (irq < 0)
Signature · 1 line
2.1.4
Applied
#2 lore raw

Re: [PATCH 2/3] mfd: intel_soc_pmic: Do not mangle error code from devm_gpiod_get_index()

Quoted 9 lines · Jarkko Nikula

It is usually better to pass actual error code from a function call than mangling it to another.

---
I haven't seen any issue with this. Random observation by looking at the code.

---
 drivers/mfd/intel_soc_pmic_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Quoted 13 lines
drivers/mfd/intel_soc_pmic_core.c +1 -1
index 08c8e3dafaf5..40488e5b52ef 100644
@@ -33,7 +33,7 @@ static int intel_soc_pmic_find_gpio_irq(struct device *dev)
 
 	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0);
 	if (IS_ERR(desc))
-		return -ENOENT;
+		return PTR_ERR(desc);
 
 	irq = gpiod_to_irq(desc);
 	if (irq < 0)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw

PATCH 3/3 mfd: intel_soc_pmic: Ensure GPIO irq is set to input pin

In reply to Jarkko Nikula

Surely GPIO irq will be used as an input pin so make sure its direction is set after requesting.

---
Again, I haven't seen any issue. Just a thought if BIOS haven't configured the pin correctly.

---
 drivers/mfd/intel_soc_pmic_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/intel_soc_pmic_core.c +1 -1
index 40488e5b52ef..857e5cccdb49 100644
@@ -31,7 +31,7 @@ static int intel_soc_pmic_find_gpio_irq(struct device *dev)
 	struct gpio_desc *desc;
 	int irq;
 
-	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0);
+	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0, GPIOD_IN);
 	if (IS_ERR(desc))
 		return PTR_ERR(desc);
 
Signature · 1 line
2.1.4
Applied
#4 lore raw

Re: [PATCH 3/3] mfd: intel_soc_pmic: Ensure GPIO irq is set to input pin

Quoted 10 lines · Jarkko Nikula

Surely GPIO irq will be used as an input pin so make sure its direction is set after requesting.

---
Again, I haven't seen any issue. Just a thought if BIOS haven't configured the pin correctly.

---
 drivers/mfd/intel_soc_pmic_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Quoted 13 lines
drivers/mfd/intel_soc_pmic_core.c +1 -1
index 40488e5b52ef..857e5cccdb49 100644
@@ -31,7 +31,7 @@ static int intel_soc_pmic_find_gpio_irq(struct device *dev)
 	struct gpio_desc *desc;
 	int irq;
 
-	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0);
+	desc = devm_gpiod_get_index(dev, "intel_soc_pmic", 0, GPIOD_IN);
 	if (IS_ERR(desc))
 		return PTR_ERR(desc);
 
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#5 lore raw
In reply to Jarkko Nikula
Quoted 8 lines · Jarkko Nikula

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.

---
 drivers/mfd/intel_soc_pmic_core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

Quoted 28 lines
drivers/mfd/intel_soc_pmic_core.c +5 -5
index df7b0642a5b4..08c8e3dafaf5 100644
@@ -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;
 
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog