Skip to content

ASoC: SOF: Intel: fix kconfig related if statements in machine drivers #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Jan 9, 2019
Merged

ASoC: SOF: Intel: fix kconfig related if statements in machine drivers #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sound/soc/intel/boards/bytcht_da7213.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"MIC1", NULL, "Headset Mic"},
{"MIC2", NULL, "Mic"},

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
/* SOC-codec link */
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
Expand All @@ -65,7 +64,6 @@ static const struct snd_soc_dapm_route audio_map[] = {

{"Playback", NULL, "ssp2 Tx"},
{"ssp2 Rx", NULL, "Capture"},
#endif
};

static int codec_fixup(struct snd_soc_pcm_runtime *rtd,
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/intel/boards/bytcr_rt5640.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
if (ret)
return ret;

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
if (byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) {
ret = snd_soc_dapm_add_routes(&card->dapm,
byt_rt5640_ssp2_aif2_map,
Expand All @@ -865,7 +864,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
}
if (ret)
return ret;
#endif

if (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) {
ret = snd_soc_dapm_add_routes(&card->dapm,
Expand Down
6 changes: 0 additions & 6 deletions sound/soc/intel/boards/bytcr_rt5651.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,13 @@ static const struct snd_soc_dapm_route byt_rt5651_ssp0_aif2_map[] = {
};

static const struct snd_soc_dapm_route byt_rt5651_ssp2_aif1_map[] = {
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
{"codec_in0", NULL, "ssp2 Rx"},
{"codec_in1", NULL, "ssp2 Rx"},

{"AIF1 Playback", NULL, "ssp2 Tx"},
{"ssp2 Rx", NULL, "AIF1 Capture"},
#endif
};

static const struct snd_soc_dapm_route byt_rt5651_ssp2_aif2_map[] = {
Expand Down Expand Up @@ -878,9 +876,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
struct device *codec_dev;
const char *i2c_name = NULL;
const char *hp_swapped;
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
bool is_bytcr = false;
#endif
int ret_val = 0;
int dai_index = 0;
int i;
Expand Down Expand Up @@ -918,7 +914,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
if (!codec_dev)
return -EPROBE_DEFER;

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
/*
* swap SSP0 if bytcr is detected
* (will be overridden if DMI quirk is detected)
Expand Down Expand Up @@ -974,7 +969,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2;
}
}
#endif

@plbossart plbossart Jan 7, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is fine


/* check quirks before creating card */
dmi_check_system(byt_rt5651_quirk_table);
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/intel/boards/cht_bsw_max98090_ti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,12 @@ static const struct snd_soc_dapm_route cht_audio_map[] = {
{"Headphone", NULL, "HPR"},
{"Ext Spk", NULL, "SPKL"},
{"Ext Spk", NULL, "SPKR"},
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"HiFi Playback", NULL, "ssp2 Tx"},
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
{"codec_in0", NULL, "ssp2 Rx" },
{"codec_in1", NULL, "ssp2 Rx" },
{"ssp2 Rx", NULL, "HiFi Capture"},
#endif

@plbossart plbossart Jan 7, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

{"Headphone", NULL, "Platform Clock"},
{"Headset Mic", NULL, "Platform Clock"},
{"Int Mic", NULL, "Platform Clock"},
Expand Down
8 changes: 0 additions & 8 deletions sound/soc/intel/boards/cht_bsw_rt5645.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,43 +159,35 @@ static const struct snd_soc_dapm_route cht_rt5650_audio_map[] = {
};

static const struct snd_soc_dapm_route cht_rt5645_ssp2_aif1_map[] = {
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"AIF1 Playback", NULL, "ssp2 Tx"},
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
{"codec_in0", NULL, "ssp2 Rx" },
{"codec_in1", NULL, "ssp2 Rx" },
{"ssp2 Rx", NULL, "AIF1 Capture"},
#endif
};

static const struct snd_soc_dapm_route cht_rt5645_ssp2_aif2_map[] = {
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"AIF2 Playback", NULL, "ssp2 Tx"},
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
{"codec_in0", NULL, "ssp2 Rx" },
{"codec_in1", NULL, "ssp2 Rx" },
{"ssp2 Rx", NULL, "AIF2 Capture"},
#endif
};

static const struct snd_soc_dapm_route cht_rt5645_ssp0_aif1_map[] = {
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"AIF1 Playback", NULL, "ssp0 Tx"},
{"ssp0 Tx", NULL, "modem_out"},
{"modem_in", NULL, "ssp0 Rx" },
{"ssp0 Rx", NULL, "AIF1 Capture"},
#endif
};

static const struct snd_soc_dapm_route cht_rt5645_ssp0_aif2_map[] = {
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"AIF2 Playback", NULL, "ssp0 Tx"},
{"ssp0 Tx", NULL, "modem_out"},
{"modem_in", NULL, "ssp0 Rx" },
{"ssp0 Rx", NULL, "AIF2 Capture"},
#endif

@plbossart plbossart Jan 7, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

};

static const struct snd_kcontrol_new cht_mc_controls[] = {
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/intel/boards/cht_bsw_rt5672.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,12 @@ static const struct snd_soc_dapm_route cht_audio_map[] = {
{"Ext Spk", NULL, "SPOLN"},
{"Ext Spk", NULL, "SPORP"},
{"Ext Spk", NULL, "SPORN"},
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
{"AIF1 Playback", NULL, "ssp2 Tx"},
{"ssp2 Tx", NULL, "codec_out0"},
{"ssp2 Tx", NULL, "codec_out1"},
{"codec_in0", NULL, "ssp2 Rx"},
{"codec_in1", NULL, "ssp2 Rx"},
{"ssp2 Rx", NULL, "AIF1 Capture"},
#endif

@plbossart plbossart Jan 7, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

{"Headphone", NULL, "Platform Clock"},
{"Headset Mic", NULL, "Platform Clock"},
{"Int Mic", NULL, "Platform Clock"},
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,4 @@ config SND_SOC_SOF_HDA

endif ## SND_SOC_SOF_INTEL_PCI

endif ## SND_SOC_SOF_INTEL
endif ## SND_SOC_SOF_INTEL_TOPLEVEL

@plbossart plbossart Jan 9, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, I missed this one. Thanks!