Skip to contentSkip to conversation

sst: select DW_DMAC_CORE since it's mandatory

PATCH In review Andy Shevchenko 2 participants 3 messages Sep 18, 2015 – Mar 18, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sst: select DW_DMAC_CORE since it's mandatory

While here group selectors under SND_SOC_INTEL_HASWELL and SND_SOC_INTEL_BAYTRAIL.

---
 sound/soc/intel/Kconfig | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
sound/soc/intel/Kconfig +5 -10
index 05fde5e6e..bc5281e 100644
@@ -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
Signature · 1 line
2.5.1
#1 lore raw
Quoted 2 lines · Andy Shevchenko

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.

Quoted 64 lines

---
 sound/soc/intel/Kconfig | 15 +++++----------

 1 file changed, 5 insertions(+), 10 deletions(-)
sound/soc/intel/Kconfig +0 -0
index 05fde5e6e..bc5281e 100644
@@ -35,15 +35,17 @@ config SND_SOC_INTEL_SST_ACPI


 config SND_SOC_INTEL_HASWELL
  tristate

sound/soc/intel/Kconfig +2 -0
+	select DW_DMAC_CORE
+	select SND_SOC_INTEL_SST


 config SND_SOC_INTEL_BAYTRAIL
  tristate

sound/soc/intel/Kconfig +2 -0
+	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

sound/soc/intel/Kconfig +0 -2
-	depends on DW_DMAC_CORE
-	select SND_SOC_INTEL_SST

  select SND_SOC_INTEL_HASWELL
  select SND_SOC_RT5640
  help

sound/soc/intel/Kconfig +0 -0
@@ -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

sound/soc/intel/Kconfig +0 -2
-	depends on DW_DMAC_CORE
-	select SND_SOC_INTEL_SST

  select SND_SOC_INTEL_BAYTRAIL
  select SND_SOC_RT5640
  help

sound/soc/intel/Kconfig +0 -0
@@ -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

sound/soc/intel/Kconfig +0 -2
-	depends on DW_DMAC_CORE
-	select SND_SOC_INTEL_SST

  select SND_SOC_INTEL_BAYTRAIL
  select SND_SOC_MAX98090
  help

sound/soc/intel/Kconfig +0 -0
@@ -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"

sound/soc/intel/Kconfig +1 -4
-	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

Signature · 7 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#2 lore raw
Quoted 6 lines · Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

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.

Quoted 66 lines
Quoted 65 lines
---
  sound/soc/intel/Kconfig | 15 +++++----------
  1 file changed, 5 insertions(+), 10 deletions(-)
sound/soc/intel/Kconfig +4 -0
index 05fde5e6e..bc5281e 100644
@@ -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

sound/soc/intel/Kconfig +0 -2
-	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

sound/soc/intel/Kconfig +0 -2
-	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

sound/soc/intel/Kconfig +0 -2
-	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"

sound/soc/intel/Kconfig +1 -4
-	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