[PATCH v1] gpio: merrifield: Add support of ACPI enabled platforms

[Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>]

The driver needs the pin control device name for ACPI.

We are looking through ACPI namespace and return first found device
based on ACPI HID for Intel Merrifield FLIS.

Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
 drivers/gpio/gpio-merrifield.c | 43 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c
index dd67a31ac337..61e75d10669d 100644
--- a/drivers/gpio/gpio-merrifield.c
+++ b/drivers/gpio/gpio-merrifield.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/gpio/driver.h>
 #include <linux/init.h>
@@ -380,9 +381,48 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv)
 	}
 }
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id mrfld_pinctrl_acpi_ids[] = {
+	{"INTC1002"},
+	{}
+};
+
+static acpi_status
+mrfld_acpi_find_pinctrl(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+	const char **name = context;
+	struct acpi_device *adev;
+
+	if (acpi_bus_get_device(handle, &adev))
+		return AE_OK;
+
+	if (acpi_match_device_ids(adev, mrfld_pinctrl_acpi_ids))
+		return AE_OK;
+
+	*name = dev_name(&adev->dev);
+	return AE_CTRL_TERMINATE;
+}
+
+static const char *mrfld_acpi_get_pinctrl_dev_name(const char *fallback)
+{
+	const char *pinctrl_dev_name = fallback;
+
+	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+			    ACPI_UINT32_MAX, mrfld_acpi_find_pinctrl, NULL,
+			    &pinctrl_dev_name, NULL);
+	return pinctrl_dev_name;
+}
+#else
+static inline const char *mrfld_acpi_get_pinctrl_dev_name(const char *fallback)
+{
+	return fallback;
+}
+#endif
+
 static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	const struct mrfld_gpio_pinrange *range;
+	const char *pinctrl_dev_name;
 	struct mrfld_gpio *priv;
 	u32 gpio_base, irq_base;
 	void __iomem *base;
@@ -439,10 +479,11 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id
 		return retval;
 	}
 
+	pinctrl_dev_name = mrfld_acpi_get_pinctrl_dev_name("pinctrl-merrifield");
 	for (i = 0; i < ARRAY_SIZE(mrfld_gpio_ranges); i++) {
 		range = &mrfld_gpio_ranges[i];
 		retval = gpiochip_add_pin_range(&priv->chip,
-						"pinctrl-merrifield",
+						pinctrl_dev_name,
 						range->gpio_base,
 						range->pin_base,
 						range->npins);
-- 
2.15.1

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html