gpiolib: acpi: Add quirks field to struct acpi_gpio_mapping

Some broken ACPI tables might require quirks in the OS.
Introduce quirks field in struct acpi_gpio_mapping.

Propagate them to struct acpi_gpio_info for further use.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 88518afa26bde10d8d9f9a7b9d5e9d607a6ae1a4..711f64b9dd300fdac87f8212523de21db1c196cf 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -414,7 +414,8 @@ EXPORT_SYMBOL_GPL(devm_acpi_dev_remove_driver_gpios);
 
 static bool acpi_get_driver_gpio_data(struct acpi_device *adev,
                                      const char *name, int index,
-                                     struct acpi_reference_args *args)
+                                     struct acpi_reference_args *args,
+                                     unsigned int *quirks)
 {
        const struct acpi_gpio_mapping *gm;
 
@@ -430,6 +431,8 @@ static bool acpi_get_driver_gpio_data(struct acpi_device *adev,
                        args->args[1] = par->line_index;
                        args->args[2] = par->active_low;
                        args->nargs = 3;
+
+                       *quirks = gm->quirks;
                        return true;
                }
 
@@ -580,6 +583,7 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode,
                                     struct acpi_gpio_lookup *lookup)
 {
        struct acpi_reference_args args;
+       unsigned int quirks = 0;
        int ret;
 
        memset(&args, 0, sizeof(args));
@@ -591,7 +595,8 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode,
                if (!adev)
                        return ret;
 
-               if (!acpi_get_driver_gpio_data(adev, propname, index, &args))
+               if (!acpi_get_driver_gpio_data(adev, propname, index, &args,
+                                              &quirks))
                        return ret;
        }
        /*
@@ -606,6 +611,7 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode,
        lookup->active_low = !!args.args[2];
 
        lookup->info.adev = args.adev;
+       lookup->info.quirks = quirks;
        return 0;
 }
 

diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
index b23aeaf5ac9ee50af5865473fb174d903e6677b8..cd4622863fe1ec07535ea81dad0c1e209ba6467c 100644 (file)
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@ -80,6 +80,7 @@ struct gpio_device {
  * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo
  * @polarity: interrupt polarity as provided by ACPI
  * @triggering: triggering type as provided by ACPI
+ * @quirks: Linux specific quirks as provided by struct acpi_gpio_mapping
  */
 struct acpi_gpio_info {
        struct acpi_device *adev;
@@ -87,6 +88,7 @@ struct acpi_gpio_info {
        bool gpioint;
        int polarity;
        int triggering;
+       unsigned int quirks;
 };
 
 /* gpio suffixes used for ACPI and device tree lookup */

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index dc1ebfeeb5ecc10e248f57084f80c72d32c6c14a..25fe77fccea087f9aefc9c0856f9dc704f7cceaa 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -978,6 +978,7 @@ struct acpi_gpio_mapping {
        const char *name;
        const struct acpi_gpio_params *data;
        unsigned int size;
+       unsigned int quirks;
 };
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_GPIOLIB)