diff options
author | V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com> | 2022-05-16 21:36:09 +0530 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-05-19 16:44:52 +0100 |
commit | 6107fb660749507d5e02988151e45884b5423cdc (patch) | |
tree | 4f0d4175c3c7fbcf03b42a07ec5596ea3e647442 /sound | |
parent | be2af740e2a9c7134f2d8ab4f104006e110b13de (diff) | |
download | linux-6107fb660749507d5e02988151e45884b5423cdc.tar.gz linux-6107fb660749507d5e02988151e45884b5423cdc.tar.bz2 linux-6107fb660749507d5e02988151e45884b5423cdc.zip |
ASoC: amd: acp: Set Speaker enable/disable pin through rt1019 codec driver
RT1019 codec has two ways of controlling the en_spkr. one way is
controlling through gpio pin method the another way is through codec
register update through driver.
Now Speaker enable/disable is controlled through codec register updated
by codec driver. This patch reverts gpio logic.
This reverts commit 7fa5c33d043160eba3be9fb8e21588dff2a467c7 ("ASoC:
amd: acp: Set gpio_spkr_en to None for max speaker amplifer in machine
driver").
Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20220516160619.17832-1-Vsujithkumar.Reddy@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/amd/acp/acp-mach.h | 1 | ||||
-rw-r--r-- | sound/soc/amd/acp/acp-sof-mach.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index c855f50d6b34..fd6299844ebe 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -21,6 +21,7 @@ #include <linux/gpio/consumer.h> #define EN_SPKR_GPIO_GB 0x11F +#define EN_SPKR_GPIO_NK 0x146 #define EN_SPKR_GPIO_NONE -EINVAL enum be_id { diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c index bf61a1726f0e..8243765d490f 100644 --- a/sound/soc/amd/acp/acp-sof-mach.c +++ b/sound/soc/amd/acp/acp-sof-mach.c @@ -37,7 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = { .hs_codec_id = RT5682, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NONE, + .gpio_spkr_en = EN_SPKR_GPIO_NK, }; static struct acp_card_drvdata sof_rt5682s_rt1019_data = { @@ -56,7 +56,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { .hs_codec_id = RT5682S, .amp_codec_id = MAX98360A, .dmic_codec_id = DMIC, - .gpio_spkr_en = EN_SPKR_GPIO_NONE, + .gpio_spkr_en = EN_SPKR_GPIO_NK, }; static const struct snd_kcontrol_new acp_controls[] = { |