diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-12-07 08:27:06 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-12-07 08:27:06 -0800 |
| commit | 2531b3bea791640d8c724c7a31e591ffb8083132 (patch) | |
| tree | 696b52cc5cbbeb80f21f6176eaf35b3372329f68 /arch/arm/mach-omap1 | |
| parent | a763ecc15d0e37c3a15ff6825183061209832685 (diff) | |
| parent | 2afdb4c41d7876e430b9bc6e2d7e2fe28609fd6a (diff) | |
| download | linux-2531b3bea791640d8c724c7a31e591ffb8083132.tar.gz linux-2531b3bea791640d8c724c7a31e591ffb8083132.tar.bz2 linux-2531b3bea791640d8c724c7a31e591ffb8083132.zip | |
Merge branch 'audio-fix' into omap-for-v4.20/fixes
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 17886744dbe6..55bf73710a59 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -247,8 +247,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_HOOKFLASH1 14 -#define LATCH2_PIN_HOOKFLASH2 15 +#define LATCH2_PIN_AUDIO_MUTE 14 +#define LATCH2_PIN_HOOKFLASH 15 static struct regulator_consumer_supply modem_nreset_consumers[] = { REGULATOR_SUPPLY("RESET#", "serial8250.1"), @@ -588,6 +588,8 @@ 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), {}, }; |