Skip to content
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

Naming convention change for sof_hda_dsp_generic #5163

Closed
wants to merge 2 commits into from
Closed

Naming convention change for sof_hda_dsp_generic #5163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb8c73d
ASoC: Intel: sof_hda_dsp_generic: naming convention change
brentlu Aug 7, 2024
fa7b505
ASoC: Intel: sof_hda_dsp_generic: rename source file
brentlu Aug 7, 2024
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
23 changes: 17 additions & 6 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,13 @@ if SND_SOC_SOF_HDA_AUDIO_CODEC

config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
tristate "Skylake+ with HDA Codecs"
depends on SND_HDA_CODEC_HDMI
select SND_SOC_INTEL_HDA_DSP_COMMON
select SND_SOC_INTEL_SOF_BOARD_HELPERS
select SND_SOC_DMIC
# SND_SOC_HDAC_HDA is already selected
imply SND_SOC_INTEL_SOF_HDA_DSP_GENERIC_MACH
help
This adds support for ASoC machine driver for Intel Skylake+
platforms with display (HDMI/DP) and HDA audio codecs, and
Smart Sound Technology (SST) integrated audio DSP.
Smart Sound Technology (SST) integrated audio DSP. This option is
deprecated and please use SND_SOC_INTEL_SOF_HDA_DSP_GENERIC_MACH
instead.
Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".

Expand Down Expand Up @@ -417,6 +415,19 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH
Say Y if you have such a device.
If unsure select "N".

config SND_SOC_INTEL_SOF_HDA_DSP_GENERIC_MACH
tristate "SOF with HDA codec"
depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
(MFD_INTEL_LPSS || COMPILE_TEST))
select SND_SOC_DMIC
select SND_SOC_INTEL_HDA_DSP_COMMON
select SND_SOC_INTEL_SOF_BOARD_HELPERS
help
This adds support for ASoC machine driver for SOF platforms with
display (HDMI/DP) and HDA audio codecs.
Say Y or m if you have such a device. This is a recommended option.
If unsure select "N".

endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL

if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/intel/boards/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ snd-soc-sof_cs42l42-y := sof_cs42l42.o
snd-soc-sof_es8336-y := sof_es8336.o
snd-soc-sof_nau8825-y := sof_nau8825.o
snd-soc-sof_da7219-y := sof_da7219.o
snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o
snd-soc-sof_hda_dsp-y := sof_hda_dsp_generic.o
snd-soc-ehl-rt5660-y := ehl_rt5660.o
snd-soc-sof-ssp-amp-y := sof_ssp_amp.o
snd-soc-sof-sdw-y += sof_sdw.o \
Expand All @@ -48,7 +48,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH) += snd-soc-sst-byt-cht-cx2072x.
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o
obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_HDA_DSP_GENERIC_MACH) += snd-soc-sof_hda_dsp.o
Copy link
Member

Choose a reason for hiding this comment

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

not really worth the effort, this will make backports/fixes problematic and also break CI with different module names.

Copy link
Author

Choose a reason for hiding this comment

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

ok, let me close this PR. thanks~

obj-$(CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH) += snd-soc-ehl-rt5660.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH) += snd-soc-sof-ssp-amp.o
Expand Down
0 sound/soc/intel/boards/skl_hda_dsp_generic.c → sound/soc/intel/boards/sof_hda_dsp_generic.c
View file
Open in desktop
File renamed without changes.
Loading