Unverified Commit 7fa5c33d authored by V sujith kumar Reddy's avatar V sujith kumar Reddy Committed by Mark Brown
Browse files

ASoC: amd: acp: Set gpio_spkr_en to None for max speaker amplifer in machine driver 



Maxim codec driver already enabling/disabling spk_en_gpio in form of sd_mode gpio
hence remove such gpio access control from machine driver to avoid conflict

Signed-off-by: default avatarV sujith kumar Reddy <vsujithkumar.reddy@amd.com>
Link: https://lore.kernel.org/r/20220131203225.1418648-1-vsujithkumar.reddy@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a4f399a1

sound/soc/amd/acp/acp-mach.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#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 {

sound/soc/amd/acp/acp-sof-mach.c

+2 −2
Original line number Diff line number Diff line
@@ -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_NK,

	.gpio_spkr_en = EN_SPKR_GPIO_NONE,

};



static struct acp_card_drvdata sof_rt5682s_max_data = {
@@ -47,7 +47,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_NK,

	.gpio_spkr_en = EN_SPKR_GPIO_NONE,

};



static const struct snd_kcontrol_new acp_controls[] = {