| Message ID | 20200926085910.21948-15-cezary.rojewski@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: Intel: Catpt - Lynx and Wildcat point | expand |
On 9/26/2020 10:59 AM, Cezary Rojewski wrote: > Prevent sound/soc/intel/haswell code compile and select catpt instead as > a recommended solution. Userspace-exposed members are compatible with > what is exposed by deprecated solution thus no harm is done. The only > visible difference is the newly added 'Loopback Mute' kcontrol. > > Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> > --- > > Changes in v7: > - patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has > been moved to the back of the list: enable catpt after machine boards > have been prepared for it first > > Changes in v5: > - remove DMADEVICES depends on: DW_DMAC_CORE already covers that > - add optional COMPILE_TEST depends on > > sound/soc/intel/Kconfig | 24 ++++++++++++------------ > sound/soc/intel/Makefile | 2 +- > sound/soc/intel/boards/Kconfig | 8 ++++---- > sound/soc/intel/catpt/Makefile | 6 ++++++ > 4 files changed, 23 insertions(+), 17 deletions(-) > create mode 100644 sound/soc/intel/catpt/Makefile > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index 0e48c4f532ce..dfc20f2bb859 100644 > --- a/sound/soc/intel/Kconfig > +++ b/sound/soc/intel/Kconfig > @@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE > # Haswell/Broadwell/Baytrail legacy and will be set > # when these platforms are enabled > > -config SND_SOC_INTEL_HASWELL > - tristate "Haswell/Broadwell Platforms" > +config SND_SOC_INTEL_CATPT > + tristate "Haswell and Broadwell" > + depends on ACPI || COMPILE_TEST We may want to limit building only to x86 platforms here. > depends on SND_DMA_SGBUF > - depends on DMADEVICES && ACPI > - select SND_SOC_INTEL_SST > - select SND_SOC_INTEL_SST_ACPI > - select SND_SOC_INTEL_SST_FIRMWARE > + select DW_DMAC_CORE > select SND_SOC_ACPI_INTEL_MATCH > help (...)
On 2020-09-29 1:49 PM, Amadeusz Sławiński wrote: > On 9/26/2020 10:59 AM, Cezary Rojewski wrote: >> Prevent sound/soc/intel/haswell code compile and select catpt instead as >> a recommended solution. Userspace-exposed members are compatible with >> what is exposed by deprecated solution thus no harm is done. The only >> visible difference is the newly added 'Loopback Mute' kcontrol. >> >> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> >> --- >> >> Changes in v7: >> - patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has >> been moved to the back of the list: enable catpt after machine boards >> have been prepared for it first >> >> Changes in v5: >> - remove DMADEVICES depends on: DW_DMAC_CORE already covers that >> - add optional COMPILE_TEST depends on >> >> sound/soc/intel/Kconfig | 24 ++++++++++++------------ >> sound/soc/intel/Makefile | 2 +- >> sound/soc/intel/boards/Kconfig | 8 ++++---- >> sound/soc/intel/catpt/Makefile | 6 ++++++ >> 4 files changed, 23 insertions(+), 17 deletions(-) >> create mode 100644 sound/soc/intel/catpt/Makefile >> >> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig >> index 0e48c4f532ce..dfc20f2bb859 100644 >> --- a/sound/soc/intel/Kconfig >> +++ b/sound/soc/intel/Kconfig >> @@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE >> # Haswell/Broadwell/Baytrail legacy and will be set >> # when these platforms are enabled >> -config SND_SOC_INTEL_HASWELL >> - tristate "Haswell/Broadwell Platforms" >> +config SND_SOC_INTEL_CATPT >> + tristate "Haswell and Broadwell" >> + depends on ACPI || COMPILE_TEST > > We may want to limit building only to x86 platforms here. > Agreed. depends on (X86 && ACPI) || COMPILE_TEST it is then. Thanks, Czarek
On 2020-09-29 3:09 PM, Rojewski, Cezary wrote: > On 2020-09-29 1:49 PM, Amadeusz Sławiński wrote: >> On 9/26/2020 10:59 AM, Cezary Rojewski wrote: >>> Prevent sound/soc/intel/haswell code compile and select catpt instead as >>> a recommended solution. Userspace-exposed members are compatible with >>> what is exposed by deprecated solution thus no harm is done. The only >>> visible difference is the newly added 'Loopback Mute' kcontrol. >>> >>> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> >>> --- >>> >>> Changes in v7: >>> - patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has >>> been moved to the back of the list: enable catpt after machine boards >>> have been prepared for it first >>> >>> Changes in v5: >>> - remove DMADEVICES depends on: DW_DMAC_CORE already covers that >>> - add optional COMPILE_TEST depends on >>> >>> sound/soc/intel/Kconfig | 24 ++++++++++++------------ >>> sound/soc/intel/Makefile | 2 +- >>> sound/soc/intel/boards/Kconfig | 8 ++++---- >>> sound/soc/intel/catpt/Makefile | 6 ++++++ >>> 4 files changed, 23 insertions(+), 17 deletions(-) >>> create mode 100644 sound/soc/intel/catpt/Makefile >>> >>> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig >>> index 0e48c4f532ce..dfc20f2bb859 100644 >>> --- a/sound/soc/intel/Kconfig >>> +++ b/sound/soc/intel/Kconfig >>> @@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE >>> # Haswell/Broadwell/Baytrail legacy and will be set >>> # when these platforms are enabled >>> -config SND_SOC_INTEL_HASWELL >>> - tristate "Haswell/Broadwell Platforms" >>> +config SND_SOC_INTEL_CATPT >>> + tristate "Haswell and Broadwell" >>> + depends on ACPI || COMPILE_TEST >> >> We may want to limit building only to x86 platforms here. >> > > Agreed. > > depends on (X86 && ACPI) || COMPILE_TEST > it is then. > After re-checking, _CATPT is dependent (found within an 'if') upon _SST_TOPLEVEL config which already consists of: depends on X86 || COMPILE_TEST so no changes are necessary. Thanks, Czarek
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 0e48c4f532ce..dfc20f2bb859 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE # Haswell/Broadwell/Baytrail legacy and will be set # when these platforms are enabled -config SND_SOC_INTEL_HASWELL - tristate "Haswell/Broadwell Platforms" +config SND_SOC_INTEL_CATPT + tristate "Haswell and Broadwell" + depends on ACPI || COMPILE_TEST depends on SND_DMA_SGBUF - depends on DMADEVICES && ACPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_ACPI - select SND_SOC_INTEL_SST_FIRMWARE + select DW_DMAC_CORE select SND_SOC_ACPI_INTEL_MATCH help - If you have a Intel Haswell or Broadwell platform connected to - an I2S codec, then enable this option by saying Y or m. This is - typically used for Chromebooks. This is a recommended option. - This option is mutually exclusive with the SOF support on - Broadwell. If you want to enable SOF on Broadwell, you need to - deselect this option first. + Enable support for Intel(R) Haswell and Broadwell platforms + with I2S codec present. This is a recommended option. + Say Y or m if you have such device. + If unsure, say N. + +config SND_SOC_INTEL_HASWELL + tristate + select SND_SOC_INTEL_CATPT config SND_SOC_INTEL_BAYTRAIL tristate "Baytrail (legacy) Platforms" diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 04ee48204fc9..c88c615f85f7 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -3,9 +3,9 @@ obj-$(CONFIG_SND_SOC) += common/ # Platform Support -obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/ +obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/ obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/ obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/ diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 12dd41796e82..6afdd9ac4478 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -26,7 +26,7 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES interface. If unsure select N. -if SND_SOC_INTEL_HASWELL +if SND_SOC_INTEL_CATPT config SND_SOC_INTEL_HASWELL_MACH tristate "Haswell Lynxpoint" @@ -40,9 +40,9 @@ config SND_SOC_INTEL_HASWELL_MACH Say Y or m if you have such a device. If unsure select "N". -endif ## SND_SOC_INTEL_HASWELL +endif ## SND_SOC_INTEL_CATPT -if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +if SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL config SND_SOC_INTEL_BDW_RT5650_MACH tristate "Broadwell with RT5650 codec" @@ -83,7 +83,7 @@ config SND_SOC_INTEL_BROADWELL_MACH Ultrabook platforms. Say Y or m if you have such a device. This is a recommended option. If unsure select "N". -endif ## SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +endif ## SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL if SND_SOC_INTEL_BAYTRAIL diff --git a/sound/soc/intel/catpt/Makefile b/sound/soc/intel/catpt/Makefile new file mode 100644 index 000000000000..c393a45795da --- /dev/null +++ b/sound/soc/intel/catpt/Makefile @@ -0,0 +1,6 @@ +snd-soc-catpt-objs := device.o dsp.o loader.o ipc.o messages.o pcm.o sysfs.o + +# tell define_trace.h where to find the trace header +CFLAGS_device.o := -I$(src) + +obj-$(CONFIG_SND_SOC_INTEL_CATPT) += snd-soc-catpt.o
Prevent sound/soc/intel/haswell code compile and select catpt instead as a recommended solution. Userspace-exposed members are compatible with what is exposed by deprecated solution thus no harm is done. The only visible difference is the newly added 'Loopback Mute' kcontrol. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- Changes in v7: - patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has been moved to the back of the list: enable catpt after machine boards have been prepared for it first Changes in v5: - remove DMADEVICES depends on: DW_DMAC_CORE already covers that - add optional COMPILE_TEST depends on sound/soc/intel/Kconfig | 24 ++++++++++++------------ sound/soc/intel/Makefile | 2 +- sound/soc/intel/boards/Kconfig | 8 ++++---- sound/soc/intel/catpt/Makefile | 6 ++++++ 4 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 sound/soc/intel/catpt/Makefile