From 540bff18daf4aa3d67004e8bb02a0ea5b3818451 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 25 Nov 2019 19:28:14 +0200
Subject: [PATCH] pinctrl: lynxpoint: Move ownership check to IRQ chip
Git-commit: 540bff18daf4aa3d67004e8bb02a0ea5b3818451
Patch-mainline: v5.6-rc1
References: jsc#SLE-12730
There is nothing wrong with requesting pin that owned by ACPI.
The only difference is how interrupt status will be reflected.
It means that in ACPI mode we may not use pin as GPIO-backed IRQ.
Taking above into consideration, move the check from GPIO to IRQ chip
callback.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/pinctrl/intel/pinctrl-lynxpoint.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
index 19e8f8f1f7aa..ddb201e5d78f 100644
--- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c
+++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
@@ -118,12 +118,6 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned int offset)
pm_runtime_get(lg->dev); /* should we put if failed */
- /* Fail if BIOS reserved pin for ACPI use */
- if (lp_gpio_acpi_use(lg, offset)) {
- dev_err(lg->dev, "gpio %d reserved for ACPI\n", offset);
- return -EBUSY;
- }
-
/*
* Reconfigure pin to GPIO mode if needed and issue a warning,
* since we expect firmware to configure it properly.
@@ -280,6 +274,12 @@ static int lp_irq_set_type(struct irq_data *d, unsigned int type)
if (hwirq >= lg->chip.ngpio)
return -EINVAL;
+ /* Fail if BIOS reserved pin for ACPI use */
+ if (lp_gpio_acpi_use(lg, hwirq)) {
+ dev_err(lg->dev, "pin %u can't be used as IRQ\n", hwirq);
+ return -EBUSY;
+ }
+
raw_spin_lock_irqsave(&lg->lock, flags);
value = ioread32(reg);
--
2.16.4