Commit 6107fb66 authored by V sujith kumar Reddy's avatar V sujith kumar Reddy Committed by Mark Brown

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 7fa5c33d ("ASoC:
amd: acp: Set gpio_spkr_en to None for max speaker amplifer in machine
driver").
Signed-off-by: default avatarV sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20220516160619.17832-1-Vsujithkumar.Reddy@amd.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent be2af740
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#define EN_SPKR_GPIO_GB 0x11F #define EN_SPKR_GPIO_GB 0x11F
#define EN_SPKR_GPIO_NK 0x146
#define EN_SPKR_GPIO_NONE -EINVAL #define EN_SPKR_GPIO_NONE -EINVAL
enum be_id { enum be_id {
......
...@@ -37,7 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = { ...@@ -37,7 +37,7 @@ static struct acp_card_drvdata sof_rt5682_max_data = {
.hs_codec_id = RT5682, .hs_codec_id = RT5682,
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .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 = { static struct acp_card_drvdata sof_rt5682s_rt1019_data = {
...@@ -56,7 +56,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { ...@@ -56,7 +56,7 @@ static struct acp_card_drvdata sof_rt5682s_max_data = {
.hs_codec_id = RT5682S, .hs_codec_id = RT5682S,
.amp_codec_id = MAX98360A, .amp_codec_id = MAX98360A,
.dmic_codec_id = DMIC, .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[] = { static const struct snd_kcontrol_new acp_controls[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment