106 lines
6.9 KiB
Diff
106 lines
6.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yannick Adam <yannick.adam@gmail.com>
|
||
|
|
Date: Tue, 14 Apr 2020 17:15:09 +0200
|
||
|
|
Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885)
|
||
|
|
|
||
|
|
> X-Git-Archeology: - Revision 454038a50d1d24e636626213ad65b3463d632aa0: https://github.com/armbian/build/commit/454038a50d1d24e636626213ad65b3463d632aa0
|
||
|
|
> X-Git-Archeology: Date: Tue, 14 Apr 2020 17:15:09 +0200
|
||
|
|
> X-Git-Archeology: From: Yannick Adam <yannick.adam@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Enable es8316 on RockPi4 (#1885)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision bd486c75623e75bdf2bdcaf09dc5a0affe9706c1: https://github.com/armbian/build/commit/bd486c75623e75bdf2bdcaf09dc5a0affe9706c1
|
||
|
|
> X-Git-Archeology: Date: Tue, 14 Apr 2020 20:14:24 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Enable es8316 on RockPi4 for Rockchip64 current too https://github.com/armbian/build/pull/1885
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
|
||
|
|
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0
|
||
|
|
> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
|
||
|
|
> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
|
||
|
|
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 6b490e16944b30ff69bf9c13678905187df0d9d4: https://github.com/armbian/build/commit/6b490e16944b30ff69bf9c13678905187df0d9d4
|
||
|
|
> X-Git-Archeology: Date: Tue, 11 Jan 2022 15:26:11 +0100
|
||
|
|
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
|
||
|
|
> X-Git-Archeology: Subject: move kernel edge to 5.16 (#3387)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
|
||
|
|
> X-Git-Archeology: Date: Sat, 26 Feb 2022 07:46:44 +0100
|
||
|
|
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Switch rockchip64 current to linux 5.15.y (#3489)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision f52a4193d02ef88333ba117c68d49486dfd7ff41: https://github.com/armbian/build/commit/f52a4193d02ef88333ba117c68d49486dfd7ff41
|
||
|
|
> X-Git-Archeology: Date: Sun, 20 Mar 2022 22:58:21 +0100
|
||
|
|
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
|
||
|
|
> X-Git-Archeology: Subject: Adding Pine64 Quartz64a as WIP target (#3539)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 0afe24c95729044910e0b3f84dc5500bcdc6524c: https://github.com/armbian/build/commit/0afe24c95729044910e0b3f84dc5500bcdc6524c
|
||
|
|
> X-Git-Archeology: Date: Sun, 24 Apr 2022 22:33:47 +0200
|
||
|
|
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
|
||
|
|
> X-Git-Archeology: Subject: move kernel media edge to 5.17 (#3704)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
|
||
|
|
> X-Git-Archeology: Date: Tue, 03 May 2022 08:27:32 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump and freeze kernel at last known working versions (#3736)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
|
||
|
|
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
|
||
|
|
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
|
||
|
|
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
|
||
|
|
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
|
||
|
|
> X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200
|
||
|
|
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
|
||
|
|
> X-Git-Archeology:
|
||
|
|
---
|
||
|
|
sound/soc/codecs/es8316.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
|
||
|
|
index ccecfdf70064..bc1535cc190e 100644
|
||
|
|
--- a/sound/soc/codecs/es8316.c
|
||
|
|
+++ b/sound/soc/codecs/es8316.c
|
||
|
|
@@ -701,7 +701,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
|
||
|
|
snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
|
||
|
|
ES8316_GPIO_ENABLE_INTERRUPT, 0);
|
||
|
|
|
||
|
|
- if (es8316->jack->status & SND_JACK_MICROPHONE) {
|
||
|
|
+ if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) {
|
||
|
|
es8316_disable_micbias_for_mic_gnd_short_detect(component);
|
||
|
|
snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|