diff mbox series

[v2] gpio: pca953x: Use PCA_LATCH_INT

Message ID 20190305091346.78199-1-andriy.shevchenko@linux.intel.com
State New
Headers show
Series [v2] gpio: pca953x: Use PCA_LATCH_INT | expand

Commit Message

Andy Shevchenko March 5, 2019, 9:13 a.m. UTC 
The commit 0cdf21b34e30

  ("gpio: pca953x: set the PCA_PCAL flag also when matching by DT")

introduces a helper macro which tells that chip supports latched interrupts,
but the macro was never used for ACPI or legacy enumeration.

So, make use of it for legacy and ACPI enumeration.

Cc: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---

v2: rebased on top of latest GPIO contributions

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

Comments

Linus Walleij March 8, 2019, 9:07 a.m. UTC | #1 
On Tue, Mar 5, 2019 at 10:13 AM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:

> The commit 0cdf21b34e30
>
>   ("gpio: pca953x: set the PCA_PCAL flag also when matching by DT")
>
> introduces a helper macro which tells that chip supports latched interrupts,
> but the macro was never used for ACPI or legacy enumeration.
>
> So, make use of it for legacy and ACPI enumeration.
>
> Cc: H. Nikolaus Schaller <hns@goldelico.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>
> v2: rebased on top of latest GPIO contributions

Ah this v2 applies. Fine then, patch applied.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 6bd55a49585b..7e76830b3368 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -65,7 +65,7 @@ 
 
 #define PCA_INT			0x0100
 #define PCA_PCAL		0x0200
-#define PCA_LATCH_INT (PCA_PCAL | PCA_INT)
+#define PCA_LATCH_INT		(PCA_PCAL | PCA_INT)
 #define PCA953X_TYPE		0x1000
 #define PCA957X_TYPE		0x2000
 #define PCA_TYPE_MASK		0xF000
@@ -88,9 +88,9 @@  static const struct i2c_device_id pca953x_id[] = {
 	{ "pca9575", 16 | PCA957X_TYPE | PCA_INT, },
 	{ "pca9698", 40 | PCA953X_TYPE, },
 
-	{ "pcal6416", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
-	{ "pcal6524", 24 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
-	{ "pcal9555a", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
+	{ "pcal6416", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
+	{ "pcal6524", 24 | PCA953X_TYPE | PCA_LATCH_INT, },
+	{ "pcal9555a", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
 
 	{ "max7310", 8  | PCA953X_TYPE, },
 	{ "max7312", 16 | PCA953X_TYPE | PCA_INT, },
@@ -109,7 +109,7 @@  static const struct i2c_device_id pca953x_id[] = {
 MODULE_DEVICE_TABLE(i2c, pca953x_id);
 
 static const struct acpi_device_id pca953x_acpi_ids[] = {
-	{ "INT3491", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
+	{ "INT3491", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
 	{ }
 };
 MODULE_DEVICE_TABLE(acpi, pca953x_acpi_ids);