Merge branch 'audio-fix' into omap-for-v4.20/fixes (2531b3be) · Commits · 戴 / test

arch/arm/mach-omap1/board-ams-delta.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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),
		{},
		};