[PATCH v4 14/59] dm: acpi: Use correct GPIO polarity type in acpi_dp_add_gpio()

[Simon Glass]

This function currently accepts the IRQ-polarity type. Fix it to use the
GPIO type instead.

Signed-off-by: Simon Glass <s...@chromium.org>
---

(no changes since v2)

Changes in v2:
- add new patch to fix polarity type in acpi_dp_add_gpio()

 drivers/sound/max98357a.c | 2 +-
 include/acpi/acpi_dp.h    | 2 +-
 lib/acpi/acpi_dp.c        | 4 ++--
 test/dm/acpi_dp.c         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 841bc6ef682..827262d235c 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -81,7 +81,7 @@ static int max98357a_acpi_fill_ssdt(const struct udevice *dev,
        dp = acpi_dp_new_table("_DSD");
        acpi_dp_add_gpio(dp, "sdmode-gpio", path, 0, 0,
                         priv->sdmode_gpio.flags & GPIOD_ACTIVE_LOW ?
-                        ACPI_IRQ_ACTIVE_LOW : ACPI_IRQ_ACTIVE_HIGH);
+                        ACPI_GPIO_ACTIVE_LOW : ACPI_GPIO_ACTIVE_HIGH);
        acpi_dp_add_integer(dp, "sdmode-delay",
                            dev_read_u32_default(dev, "sdmode-delay", 0));
        acpi_dp_write(ctx, dp);
diff --git a/include/acpi/acpi_dp.h b/include/acpi/acpi_dp.h
index 0b514bce59c..5e539b1d218 100644
--- a/include/acpi/acpi_dp.h
+++ b/include/acpi/acpi_dp.h
@@ -221,7 +221,7 @@ struct acpi_dp *acpi_dp_add_child(struct acpi_dp *dp, const 
char *name,
  */
 struct acpi_dp *acpi_dp_add_gpio(struct acpi_dp *dp, const char *name,
                                 const char *ref, int index, int pin,
-                                enum acpi_irq_polarity polarity);
+                                enum acpi_gpio_polarity polarity);
 
 /**
  * acpi_dp_write() - Write Device Property hierarchy and clean up resources
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 579cab47715..7e3e3259d8d 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -324,7 +324,7 @@ struct acpi_dp *acpi_dp_add_integer_array(struct acpi_dp 
*dp, const char *name,
 
 struct acpi_dp *acpi_dp_add_gpio(struct acpi_dp *dp, const char *name,
                                 const char *ref, int index, int pin,
-                                enum acpi_irq_polarity polarity)
+                                enum acpi_gpio_polarity polarity)
 {
        struct acpi_dp *gpio;
 
@@ -336,7 +336,7 @@ struct acpi_dp *acpi_dp_add_gpio(struct acpi_dp *dp, const 
char *name,
        if (!acpi_dp_add_reference(gpio, NULL, ref) ||
            !acpi_dp_add_integer(gpio, NULL, index) ||
            !acpi_dp_add_integer(gpio, NULL, pin) ||
-           !acpi_dp_add_integer(gpio, NULL, polarity == ACPI_IRQ_ACTIVE_LOW))
+           !acpi_dp_add_integer(gpio, NULL, polarity == ACPI_GPIO_ACTIVE_LOW))
                return NULL;
 
        if (!acpi_dp_add_array(dp, gpio))
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index e0fa61263c8..44bcabda6bc 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -398,9 +398,9 @@ static int dm_test_acpi_dp_gpio(struct unit_test_state *uts)
 
        /* Try a few different parameters */
        ut_assertnonnull(acpi_dp_add_gpio(dp, "reset", TEST_REF, 0x23, 0x24,
-                                         ACPI_IRQ_ACTIVE_HIGH));
+                                         ACPI_GPIO_ACTIVE_HIGH));
        ut_assertnonnull(acpi_dp_add_gpio(dp, "allow", TEST_REF, 0, 0,
-                                         ACPI_IRQ_ACTIVE_LOW));
+                                         ACPI_GPIO_ACTIVE_LOW));
 
        ptr = acpigen_get_current(ctx);
        ut_assertok(acpi_dp_write(ctx, dp));
-- 
2.28.0.681.g6f77f65b4e-goog