Merge branch 'asoc-5.3' into asoc-linus
[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / board-ams-delta.c
index e47a6fbcfd6e5e100c056869a0304734c1e07fe1..a2aa7a12b3742fd8d15ba9bc4af53a56ca1f1ab2 100644 (file)
@@ -246,8 +246,8 @@ static struct platform_device latch2_gpio_device = {
 #define LATCH2_PIN_SCARD_CMDVCC                11
 #define LATCH2_PIN_MODEM_NRESET                12
 #define LATCH2_PIN_MODEM_CODEC         13
-#define LATCH2_PIN_AUDIO_MUTE          14
-#define LATCH2_PIN_HOOKFLASH           15
+#define LATCH2_PIN_HANDSFREE_MUTE      14
+#define LATCH2_PIN_HANDSET_MUTE                15
 
 static struct regulator_consumer_supply modem_nreset_consumers[] = {
        REGULATOR_SUPPLY("RESET#", "serial8250.1"),
@@ -476,6 +476,10 @@ static struct gpiod_lookup_table ams_delta_audio_gpio_table = {
                            "hook_switch", 0),
                GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_MODEM_CODEC,
                            "modem_codec", 0),
+               GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_HANDSFREE_MUTE,
+                           "handsfree_mute", 0),
+               GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_HANDSET_MUTE,
+                           "handset_mute", 0),
                { },
        },
 };
@@ -590,8 +594,6 @@ static int gpiochip_match_by_label(struct gpio_chip *chip, void *data)
 static struct gpiod_hog ams_delta_gpio_hogs[] = {
        GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT, "keybrd_dataout",
                 GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW),
-       GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_AUDIO_MUTE, "audio_mute",
-                GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW),
        {},
 };