diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-19 07:17:21 +0100 |
commit | 62b7f5931c54e96fca56dd8761b0e466d355c881 (patch) | |
tree | 1258b392752379833a075df006c2f6d7ac4be51d /target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch | |
parent | 76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (diff) | |
download | upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.gz upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.bz2 upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.zip |
bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch b/target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch new file mode 100644 index 0000000000..10fe757577 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0919-Mute-bug-fix-for-the-Audioinjector.net-isolated-soun.patch @@ -0,0 +1,64 @@ +From 11a2b192e0a8b7514895f9f6b7451f4c6ddd0a22 Mon Sep 17 00:00:00 2001 +From: Matt Flax <flatmax@flatmax.org> +Date: Fri, 17 Jul 2020 09:17:36 +1000 +Subject: [PATCH] Mute bug fix for the Audioinjector.net isolated + soundcard. + +--- + .../bcm/audioinjector-isolated-soundcard.c | 26 +++---------------- + 1 file changed, 3 insertions(+), 23 deletions(-) + +--- a/sound/soc/bcm/audioinjector-isolated-soundcard.c ++++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c +@@ -42,41 +42,20 @@ static int audioinjector_isolated_dai_in + int ret=snd_soc_dai_set_sysclk(rtd->codec_dai, 0, 24576000, 0); + if (ret) + return ret; +- + return snd_soc_dai_set_bclk_ratio(rtd->cpu_dai, 64); + } + + static int audioinjector_isolated_startup(struct snd_pcm_substream *substream) + { + snd_pcm_hw_constraint_list(substream->runtime, 0, +- SNDRV_PCM_HW_PARAM_RATE, &audioinjector_isolated_constraints); +- +- return 0; +-} ++ SNDRV_PCM_HW_PARAM_RATE, &audioinjector_isolated_constraints); + +-static int audioinjector_isolated_trigger(struct snd_pcm_substream *substream, +- int cmd){ +- +- switch (cmd) { +- case SNDRV_PCM_TRIGGER_STOP: +- case SNDRV_PCM_TRIGGER_SUSPEND: +- case SNDRV_PCM_TRIGGER_PAUSE_PUSH: +- gpiod_set_value(mute_gpio, 0); +- break; +- case SNDRV_PCM_TRIGGER_START: +- case SNDRV_PCM_TRIGGER_RESUME: +- case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: +- gpiod_set_value(mute_gpio, 1); +- break; +- default: +- return -EINVAL; +- } ++ gpiod_set_value(mute_gpio, 1); + return 0; + } + + static struct snd_soc_ops audioinjector_isolated_ops = { + .startup = audioinjector_isolated_startup, +- .trigger = audioinjector_isolated_trigger, + }; + + SND_SOC_DAILINK_DEFS(audioinjector_isolated, +@@ -153,6 +132,7 @@ static int audioinjector_isolated_probe( + dev_err(&pdev->dev, "mute gpio not found in dt overlay\n"); + return PTR_ERR(mute_gpio); + } ++ gpiod_set_value(mute_gpio, 0); + } + + ret = devm_snd_soc_register_card(&pdev->dev, card); |