| Message ID | 1442576689-32221-1-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2015-09-18 at 14:44 +0300, Andy Shevchenko wrote: > While here group selectors under SND_SOC_INTEL_HASWELL and > SND_SOC_INTEL_BAYTRAIL. It seems patch is not applied anymore. I will send v2 if no one objects on the approach. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > sound/soc/intel/Kconfig | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index 05fde5e6e..bc5281e 100644 > --- a/sound/soc/intel/Kconfig > +++ b/sound/soc/intel/Kconfig > @@ -35,15 +35,17 @@ config SND_SOC_INTEL_SST_ACPI > > config SND_SOC_INTEL_HASWELL > tristate > + select DW_DMAC_CORE > + select SND_SOC_INTEL_SST > > config SND_SOC_INTEL_BAYTRAIL > tristate > + select DW_DMAC_CORE > + select SND_SOC_INTEL_SST > > config SND_SOC_INTEL_HASWELL_MACH > tristate "ASoC Audio DSP support for Intel Haswell > Lynxpoint" > depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM > - depends on DW_DMAC_CORE > - select SND_SOC_INTEL_SST > select SND_SOC_INTEL_HASWELL > select SND_SOC_RT5640 > help > @@ -55,8 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH > config SND_SOC_INTEL_BYT_RT5640_MACH > tristate "ASoC Audio driver for Intel Baytrail with RT5640 > codec" > depends on X86_INTEL_LPSS && I2C > - depends on DW_DMAC_CORE > - select SND_SOC_INTEL_SST > select SND_SOC_INTEL_BAYTRAIL > select SND_SOC_RT5640 > help > @@ -66,8 +66,6 @@ config SND_SOC_INTEL_BYT_RT5640_MACH > config SND_SOC_INTEL_BYT_MAX98090_MACH > tristate "ASoC Audio driver for Intel Baytrail with MAX98090 > codec" > depends on X86_INTEL_LPSS && I2C > - depends on DW_DMAC_CORE > - select SND_SOC_INTEL_SST > select SND_SOC_INTEL_BAYTRAIL > select SND_SOC_MAX98090 > help > @@ -76,10 +74,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH > > config SND_SOC_INTEL_BROADWELL_MACH > tristate "ASoC Audio DSP support for Intel Broadwell > Wildcatpoint" > - depends on X86_INTEL_LPSS && I2C && DW_DMAC && \ > - I2C_DESIGNWARE_PLATFORM > - depends on DW_DMAC_CORE > - select SND_SOC_INTEL_SST > + depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM > select SND_SOC_INTEL_HASWELL > select SND_SOC_RT286 > help
On 3/18/16 7:24 AM, Andy Shevchenko wrote: > On Fri, 2015-09-18 at 14:44 +0300, Andy Shevchenko wrote: >> While here group selectors under SND_SOC_INTEL_HASWELL and >> SND_SOC_INTEL_BAYTRAIL. > > It seems patch is not applied anymore. > I will send v2 if no one objects on the approach. I don't think DW_DMAC_CORE is mandatory at all for BAYTRAIL. We've have a thread with Keyon on this. > >> >> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> --- >> sound/soc/intel/Kconfig | 15 +++++---------- >> 1 file changed, 5 insertions(+), 10 deletions(-) >> >> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig >> index 05fde5e6e..bc5281e 100644 >> --- a/sound/soc/intel/Kconfig >> +++ b/sound/soc/intel/Kconfig >> @@ -35,15 +35,17 @@ config SND_SOC_INTEL_SST_ACPI >> >> config SND_SOC_INTEL_HASWELL >> tristate >> + select DW_DMAC_CORE >> + select SND_SOC_INTEL_SST >> >> config SND_SOC_INTEL_BAYTRAIL >> tristate >> + select DW_DMAC_CORE >> + select SND_SOC_INTEL_SST >> >> config SND_SOC_INTEL_HASWELL_MACH >> tristate "ASoC Audio DSP support for Intel Haswell >> Lynxpoint" >> depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM >> - depends on DW_DMAC_CORE >> - select SND_SOC_INTEL_SST >> select SND_SOC_INTEL_HASWELL >> select SND_SOC_RT5640 >> help >> @@ -55,8 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH >> config SND_SOC_INTEL_BYT_RT5640_MACH >> tristate "ASoC Audio driver for Intel Baytrail with RT5640 >> codec" >> depends on X86_INTEL_LPSS && I2C >> - depends on DW_DMAC_CORE >> - select SND_SOC_INTEL_SST >> select SND_SOC_INTEL_BAYTRAIL >> select SND_SOC_RT5640 >> help >> @@ -66,8 +66,6 @@ config SND_SOC_INTEL_BYT_RT5640_MACH >> config SND_SOC_INTEL_BYT_MAX98090_MACH >> tristate "ASoC Audio driver for Intel Baytrail with MAX98090 >> codec" >> depends on X86_INTEL_LPSS && I2C >> - depends on DW_DMAC_CORE >> - select SND_SOC_INTEL_SST >> select SND_SOC_INTEL_BAYTRAIL >> select SND_SOC_MAX98090 >> help >> @@ -76,10 +74,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH >> >> config SND_SOC_INTEL_BROADWELL_MACH >> tristate "ASoC Audio DSP support for Intel Broadwell >> Wildcatpoint" >> - depends on X86_INTEL_LPSS && I2C && DW_DMAC && \ >> - I2C_DESIGNWARE_PLATFORM >> - depends on DW_DMAC_CORE >> - select SND_SOC_INTEL_SST >> + depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM >> select SND_SOC_INTEL_HASWELL >> select SND_SOC_RT286 >> help >
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 05fde5e6e..bc5281e 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -35,15 +35,17 @@ config SND_SOC_INTEL_SST_ACPI config SND_SOC_INTEL_HASWELL tristate + select DW_DMAC_CORE + select SND_SOC_INTEL_SST config SND_SOC_INTEL_BAYTRAIL tristate + select DW_DMAC_CORE + select SND_SOC_INTEL_SST config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -55,8 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST select SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5640 help @@ -66,8 +66,6 @@ config SND_SOC_INTEL_BYT_RT5640_MACH config SND_SOC_INTEL_BYT_MAX98090_MACH tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST select SND_SOC_INTEL_BAYTRAIL select SND_SOC_MAX98090 help @@ -76,10 +74,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH config SND_SOC_INTEL_BROADWELL_MACH tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" - depends on X86_INTEL_LPSS && I2C && DW_DMAC && \ - I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE - select SND_SOC_INTEL_SST + depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help
While here group selectors under SND_SOC_INTEL_HASWELL and SND_SOC_INTEL_BAYTRAIL. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- sound/soc/intel/Kconfig | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)