Skip to content

Commit 933de2d

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: avs: ssm4567: Remove nau8825 bits
Some of the nau8825 clock control got into the ssm4567, remove it. Signed-off-by: Cezary Rojewski <[email protected]> Signed-off-by: Amadeusz Sławiński <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent d24dbc8 commit 933de2d

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

sound/soc/intel/avs/boards/ssm4567.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <sound/soc-acpi.h>
1616
#include "../../../codecs/nau8825.h"
1717

18-
#define SKL_NUVOTON_CODEC_DAI "nau8825-hifi"
1918
#define SKL_SSM_CODEC_DAI "ssm4567-hifi"
2019

2120
static struct snd_soc_codec_conf card_codec_conf[] = {
@@ -34,41 +33,11 @@ static const struct snd_kcontrol_new card_controls[] = {
3433
SOC_DAPM_PIN_SWITCH("Right Speaker"),
3534
};
3635

37-
static int
38-
platform_clock_control(struct snd_soc_dapm_widget *w, struct snd_kcontrol *control, int event)
39-
{
40-
struct snd_soc_dapm_context *dapm = w->dapm;
41-
struct snd_soc_card *card = dapm->card;
42-
struct snd_soc_dai *codec_dai;
43-
int ret;
44-
45-
codec_dai = snd_soc_card_get_codec_dai(card, SKL_NUVOTON_CODEC_DAI);
46-
if (!codec_dai) {
47-
dev_err(card->dev, "Codec dai not found\n");
48-
return -EINVAL;
49-
}
50-
51-
if (SND_SOC_DAPM_EVENT_ON(event)) {
52-
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_MCLK, 24000000,
53-
SND_SOC_CLOCK_IN);
54-
if (ret < 0)
55-
dev_err(card->dev, "set sysclk err = %d\n", ret);
56-
} else {
57-
ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_INTERNAL, 0, SND_SOC_CLOCK_IN);
58-
if (ret < 0)
59-
dev_err(card->dev, "set sysclk err = %d\n", ret);
60-
}
61-
62-
return ret;
63-
}
64-
6536
static const struct snd_soc_dapm_widget card_widgets[] = {
6637
SND_SOC_DAPM_SPK("Left Speaker", NULL),
6738
SND_SOC_DAPM_SPK("Right Speaker", NULL),
6839
SND_SOC_DAPM_SPK("DP1", NULL),
6940
SND_SOC_DAPM_SPK("DP2", NULL),
70-
SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, platform_clock_control,
71-
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
7241
};
7342

7443
static const struct snd_soc_dapm_route card_base_routes[] = {

0 commit comments

Comments
 (0)