Skip to contentSkip to conversation

ASoC: Intel: clean up Kconfig

PATCH Superseded Andy Shevchenko 5 participants 15 messages Jan 2, 2017 – Jan 17, 2017

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover ASoC: Intel: clean up Kconfig

Clean up Kconfig here:
- select DW_DMAC_CORE because it's mandatory for some modules
- remove redundant selects and dependencies
- rename MFLD_PLATFORM to MID_PLATFORM to show that it covers more than Medfield

Since v2:
- add three more patches
- rebase on top of latest linux-next

Andy Shevchenko (4):
ASoC: Intel: select DW_DMAC_CORE since it's mandatory
ASoC: Intel: remove redundant select SND_SOC_INTEL_SST
ASoC: Intel: remove ignored dependencies
ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

 sound/soc/intel/Kconfig       | 46 ++++++++++++++-----------------------------
 sound/soc/intel/Makefile      |  2 +-
 sound/soc/intel/atom/Makefile |  7 ++++---
 3 files changed, 20 insertions(+), 35 deletions(-)
Signature · 1 line
2.11.0
#1 lore raw

PATCH v3 1/4 ASoC: Intel: select DW_DMAC_CORE since it's mandatory

Select DW_DMAC_CORE like the rest of glue drivers do, e.g. drivers/dma/dw/Kconfig.

While here group selectors under SND_SOC_INTEL_HASWELL and SND_SOC_INTEL_BAYTRAIL.

---
 sound/soc/intel/Kconfig | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)
sound/soc/intel/Kconfig +8 -18
index fd5d1e091038..3da3b28b70e1 100644
@@ -33,11 +33,9 @@ config SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SST_MATCH if ACPI
 	depends on (X86 || COMPILE_TEST)
 
-# firmware stuff depends DW_DMAC_CORE; since there is no depends-on from
-# the reverse selection, each machine driver needs to select
-# SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE
 config SND_SOC_INTEL_SST_FIRMWARE
 	tristate
+	select DW_DMAC_CORE
 
 config SND_SOC_INTEL_SST_ACPI
 	tristate
@@ -47,16 +45,17 @@ config SND_SOC_INTEL_SST_MATCH
 
 config SND_SOC_INTEL_HASWELL
 	tristate
+	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SST_FIRMWARE
 
 config SND_SOC_INTEL_BAYTRAIL
 	tristate
+	select SND_SOC_INTEL_SST
+	select SND_SOC_INTEL_SST_FIRMWARE
 
 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
@@ -99,9 +98,7 @@ config SND_SOC_INTEL_BXT_RT298_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 && (SND_SST_IPC_ACPI = n)
-	select SND_SOC_INTEL_SST
-	select SND_SOC_INTEL_SST_FIRMWARE
+	depends on SND_SST_IPC_ACPI = n
 	select SND_SOC_INTEL_BAYTRAIL
 	select SND_SOC_RT5640
 	help
@@ -112,9 +109,7 @@ 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 && (SND_SST_IPC_ACPI = n)
-	select SND_SOC_INTEL_SST
-	select SND_SOC_INTEL_SST_FIRMWARE
+	depends on SND_SST_IPC_ACPI = n
 	select SND_SOC_INTEL_BAYTRAIL
 	select SND_SOC_MAX98090
 	help
@@ -123,9 +118,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
 
 config SND_SOC_INTEL_BDW_RT5677_MACH
 	tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
-	depends on X86_INTEL_LPSS && GPIOLIB && I2C && DW_DMAC
-	depends on DW_DMAC_CORE=y
-	select SND_SOC_INTEL_SST
+	depends on X86_INTEL_LPSS && GPIOLIB && I2C
 	select SND_SOC_INTEL_HASWELL
 	select SND_SOC_RT5677
 	help
@@ -134,10 +127,7 @@ config SND_SOC_INTEL_BDW_RT5677_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.11.0
#7 lore raw

PATCH v3 4/4 ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

In reply to Andy Shevchenko

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is not only about Medfield platform.

---
 sound/soc/intel/Kconfig       | 14 +++++++-------
 sound/soc/intel/Makefile      |  2 +-
 sound/soc/intel/atom/Makefile |  7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)
sound/soc/intel/Kconfig +7 -7
index 7da8b9ceb728..c44da83c71a8 100644
@@ -2,7 +2,7 @@ config SND_MFLD_MACHINE
 	tristate "SOC Machine Audio driver for Intel Medfield MID platform"
 	depends on INTEL_SCU_IPC
 	select SND_SOC_SN95031
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
 	select SND_SST_IPC_PCI
 	help
           This adds support for ASoC machine driver for Intel(R) MID Medfield platform
@@ -10,7 +10,7 @@ config SND_MFLD_MACHINE
           Say Y if you have such a device.
           If unsure select "N".
 
-config SND_SST_MFLD_PLATFORM
+config SND_SST_MID_PLATFORM
 	tristate
 	select SND_SOC_COMPRESS
 
@@ -137,7 +137,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
         tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
 	depends on X86 && I2C && ACPI
 	select SND_SOC_RT5640
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
 	select SND_SST_IPC_ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
 	help
@@ -150,7 +150,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
         tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
 	depends on X86 && I2C && ACPI
 	select SND_SOC_RT5651
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
 	select SND_SST_IPC_ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
 	help
@@ -163,7 +163,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
         select SND_SOC_RT5670
-        select SND_SST_MFLD_PLATFORM
+        select SND_SST_MID_PLATFORM
         select SND_SST_IPC_ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
         help
@@ -176,7 +176,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
 	tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
 	depends on X86_INTEL_LPSS && I2C && ACPI
 	select SND_SOC_RT5645
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
 	select SND_SST_IPC_ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
 	help
@@ -189,7 +189,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
 	depends on X86_INTEL_LPSS && I2C && ACPI
 	select SND_SOC_MAX98090
 	select SND_SOC_TS3A227E
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
 	select SND_SST_IPC_ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
 	help
sound/soc/intel/Makefile +1 -1
index 2b45435e6245..58578f8a3b45 100644
@@ -4,7 +4,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
 # Platform Support
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
 obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
-obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += atom/
+obj-$(CONFIG_SND_SST_MID_PLATFORM) += atom/
 obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
 
 # Machine support
sound/soc/intel/atom/Makefile +4 -3
index ce8074fa6d66..a1f2f1ba158d 100644
@@ -1,7 +1,8 @@
-snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
-	        sst-mfld-platform-compress.o sst-atom-controls.o
+snd-soc-sst-mid-platform-objs := sst-mfld-platform-pcm.o \
+				 sst-mfld-platform-compress.o \
+				 sst-atom-controls.o
 
-obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
+obj-$(CONFIG_SND_SST_MID_PLATFORM) += snd-soc-sst-mid-platform.o
 
 # DSP driver
 obj-$(CONFIG_SND_SST_IPC) += sst/
Signature · 1 line
2.11.0
#3 lore raw

PATCH v3 2/4 ASoC: Intel: remove redundant select SND_SOC_INTEL_SST

In reply to Andy Shevchenko

SND_SOC_INTEL_SKYLAKE selects SND_SOC_INTEL_SST already. Thus no need to duplicate. Remove duplications.

---
 sound/soc/intel/Kconfig | 5 -----
 1 file changed, 5 deletions(-)
sound/soc/intel/Kconfig +0 -5
index 3da3b28b70e1..7b60689a22d4 100644
@@ -67,7 +67,6 @@ config SND_SOC_INTEL_HASWELL_MACH
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_DA7219
 	select SND_SOC_MAX98357A
@@ -83,7 +82,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 config SND_SOC_INTEL_BXT_RT298_MACH
 	tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_RT298
 	select SND_SOC_DMIC
@@ -210,7 +208,6 @@ config SND_SOC_INTEL_SKYLAKE
 config SND_SOC_INTEL_SKL_RT286_MACH
 	tristate "ASoC Audio driver for SKL with RT286 I2S mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_RT286
 	select SND_SOC_DMIC
@@ -224,7 +221,6 @@ config SND_SOC_INTEL_SKL_RT286_MACH
 config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 	tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
 	depends on X86_INTEL_LPSS && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_NAU8825
 	select SND_SOC_SSM4567
@@ -239,7 +235,6 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
 	tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
 	depends on X86_INTEL_LPSS && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_NAU8825
 	select SND_SOC_MAX98357A
Signature · 1 line
2.11.0
#5 lore raw

PATCH v3 3/4 ASoC: Intel: remove ignored dependencies

In reply to Andy Shevchenko

For selected only options the explicit dependencies do not make much sense becase Kbuild ignores them anyway. Remove them explicitly.

---
 sound/soc/intel/Kconfig | 1 -
 1 file changed, 1 deletion(-)
sound/soc/intel/Kconfig +0 -1
index 7b60689a22d4..7da8b9ceb728 100644
@@ -31,7 +31,6 @@ config SND_SOC_INTEL_SST
 	tristate
 	select SND_SOC_INTEL_SST_ACPI if ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
-	depends on (X86 || COMPILE_TEST)
 
 config SND_SOC_INTEL_SST_FIRMWARE
 	tristate
Signature · 1 line
2.11.0
#8 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

In reply to Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is not only about Medfield platform.

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Quoted 104 lines
---
  sound/soc/intel/Kconfig       | 14 +++++++-------
  sound/soc/intel/Makefile      |  2 +-
  sound/soc/intel/atom/Makefile |  7 ++++---
  3 files changed, 12 insertions(+), 11 deletions(-)
sound/soc/intel/Kconfig +7 -7
index 7da8b9ceb728..c44da83c71a8 100644
@@ -2,7 +2,7 @@ config SND_MFLD_MACHINE
  	tristate "SOC Machine Audio driver for Intel Medfield MID platform"
  	depends on INTEL_SCU_IPC
  	select SND_SOC_SN95031
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
  	select SND_SST_IPC_PCI
  	help
            This adds support for ASoC machine driver for Intel(R) MID Medfield platform
@@ -10,7 +10,7 @@ config SND_MFLD_MACHINE
            Say Y if you have such a device.
            If unsure select "N".
 
-config SND_SST_MFLD_PLATFORM
+config SND_SST_MID_PLATFORM
  	tristate
  	select SND_SOC_COMPRESS
 
@@ -137,7 +137,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
          tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
  	depends on X86 && I2C && ACPI
  	select SND_SOC_RT5640
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
  	select SND_SST_IPC_ACPI
  	select SND_SOC_INTEL_SST_MATCH if ACPI
  	help
@@ -150,7 +150,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH
          tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
  	depends on X86 && I2C && ACPI
  	select SND_SOC_RT5651
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
  	select SND_SST_IPC_ACPI
  	select SND_SOC_INTEL_SST_MATCH if ACPI
  	help
@@ -163,7 +163,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
          tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
          depends on X86_INTEL_LPSS && I2C && ACPI
          select SND_SOC_RT5670
-        select SND_SST_MFLD_PLATFORM
+        select SND_SST_MID_PLATFORM
          select SND_SST_IPC_ACPI
  	select SND_SOC_INTEL_SST_MATCH if ACPI
          help
@@ -176,7 +176,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
  	tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
  	depends on X86_INTEL_LPSS && I2C && ACPI
  	select SND_SOC_RT5645
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
  	select SND_SST_IPC_ACPI
  	select SND_SOC_INTEL_SST_MATCH if ACPI
  	help
@@ -189,7 +189,7 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
  	depends on X86_INTEL_LPSS && I2C && ACPI
  	select SND_SOC_MAX98090
  	select SND_SOC_TS3A227E
-	select SND_SST_MFLD_PLATFORM
+	select SND_SST_MID_PLATFORM
  	select SND_SST_IPC_ACPI
  	select SND_SOC_INTEL_SST_MATCH if ACPI
  	help
sound/soc/intel/Makefile +1 -1
index 2b45435e6245..58578f8a3b45 100644
@@ -4,7 +4,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
  # Platform Support
  obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
  obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
-obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += atom/
+obj-$(CONFIG_SND_SST_MID_PLATFORM) += atom/
  obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
 
  # Machine support
sound/soc/intel/atom/Makefile +4 -3
index ce8074fa6d66..a1f2f1ba158d 100644
@@ -1,7 +1,8 @@
-snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
-	        sst-mfld-platform-compress.o sst-atom-controls.o
+snd-soc-sst-mid-platform-objs := sst-mfld-platform-pcm.o \
+				 sst-mfld-platform-compress.o \
+				 sst-atom-controls.o
 
-obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
+obj-$(CONFIG_SND_SST_MID_PLATFORM) += snd-soc-sst-mid-platform.o
 
  # DSP driver
  obj-$(CONFIG_SND_SST_IPC) += sst/
Acked-by on v3 1/4
#2 lore raw

Re: [PATCH v3 1/4] ASoC: Intel: select DW_DMAC_CORE since it's mandatory

In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

Select DW_DMAC_CORE like the rest of glue drivers do, e.g. drivers/dma/dw/Kconfig.

While here group selectors under SND_SOC_INTEL_HASWELL and SND_SOC_INTEL_BAYTRAIL.

thanks,
~Keyon

Quoted 77 lines
---
  sound/soc/intel/Kconfig | 26 ++++++++------------------
  1 file changed, 8 insertions(+), 18 deletions(-)
sound/soc/intel/Kconfig +7 -14
index fd5d1e091038..3da3b28b70e1 100644
@@ -33,11 +33,9 @@ config SND_SOC_INTEL_SST
  	select SND_SOC_INTEL_SST_MATCH if ACPI
  	depends on (X86 || COMPILE_TEST)
 
-# firmware stuff depends DW_DMAC_CORE; since there is no depends-on from
-# the reverse selection, each machine driver needs to select
-# SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE
  config SND_SOC_INTEL_SST_FIRMWARE
  	tristate
+	select DW_DMAC_CORE
 
  config SND_SOC_INTEL_SST_ACPI
  	tristate
@@ -47,16 +45,17 @@ config SND_SOC_INTEL_SST_MATCH
 
  config SND_SOC_INTEL_HASWELL
  	tristate
+	select SND_SOC_INTEL_SST
  	select SND_SOC_INTEL_SST_FIRMWARE
 
  config SND_SOC_INTEL_BAYTRAIL
  	tristate
+	select SND_SOC_INTEL_SST
+	select SND_SOC_INTEL_SST_FIRMWARE
 
  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
@@ -99,9 +98,7 @@ config SND_SOC_INTEL_BXT_RT298_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 && (SND_SST_IPC_ACPI = n)
-	select SND_SOC_INTEL_SST
-	select SND_SOC_INTEL_SST_FIRMWARE
+	depends on SND_SST_IPC_ACPI = n
  	select SND_SOC_INTEL_BAYTRAIL
  	select SND_SOC_RT5640
  	help
@@ -112,9 +109,7 @@ 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 && (SND_SST_IPC_ACPI = n)
-	select SND_SOC_INTEL_SST
-	select SND_SOC_INTEL_SST_FIRMWARE
+	depends on SND_SST_IPC_ACPI = n
  	select SND_SOC_INTEL_BAYTRAIL
  	select SND_SOC_MAX98090
  	help
@@ -123,9 +118,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
 
  config SND_SOC_INTEL_BDW_RT5677_MACH
  	tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
-	depends on X86_INTEL_LPSS && GPIOLIB && I2C && DW_DMAC
-	depends on DW_DMAC_CORE=y
-	select SND_SOC_INTEL_SST
+	depends on X86_INTEL_LPSS && GPIOLIB && I2C
  	select SND_SOC_INTEL_HASWELL
  	select SND_SOC_RT5677
  	help
@@ -134,10 +127,7 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
 

sound/soc/intel/Kconfig config SND_SOC_INTEL_BDW_RT5677_MACH · line 133

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

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#9 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

In reply to Pierre-Louis Bossart
Quoted 5 lines · Pierre-Louis Bossart
Quoted 2 lines · Andy Shevchenko

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is not only about Medfield platform.

Quoted 8 lines

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Mea culpa..

So we started this with medfield and the driver construction is pretty much the same untill skylake. So clubbing under mfld bucket made sense to me.

MID is not flavour of the season now.

If anyone comes with a better name, am for that :)

Signature · 1 line
~Vinod
#10 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

Quoted 12 lines
Quoted 12 lines · Andy Shevchenko
Quoted 2 lines

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is not only about Medfield platform.

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Quoted 8 lines

Mea culpa..

So we started this with medfield and the driver construction is pretty much the same untill skylake. So clubbing under mfld bucket made sense to me.

MID is not flavour of the season now.

If anyone comes with a better name, am for that :)

SND_SST_HIFI2_MOBILE_PLATFORM ?

#11 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

Quoted 14 lines · Pierre-Louis Bossart
Quoted 14 lines
Quoted 13 lines · Andy Shevchenko
Quoted 3 lines

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is
not only about Medfield platform.

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Quoted 8 lines
Quoted 8 lines

Mea culpa..

So we started this with medfield and the driver construction is pretty much
the same untill skylake. So clubbing under mfld bucket made sense to me.

MID is not flavour of the season now.

Would be, though it covers at least few out of them, MFLD just refers to one.

Quoted 2 lines
Quoted 2 lines

If anyone comes with a better name, am for that :)

_ATOM ? Sounds too broad...

Quoted 2 lines

SND_SST_HIFI2_MOBILE_PLATFORM ?

Where HIFI2 part came from? Any documentation (maybe internal) available to look at? (Because it's not obvious to me how all listed above has something in common)

And I would get rid of _MOBILE part.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#12 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

Quoted 33 lines · Andy Shevchenko
Quoted 14 lines · Pierre-Louis Bossart
Quoted 14 lines
Quoted 13 lines · Andy Shevchenko
Quoted 3 lines

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is
not only about Medfield platform.

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Quoted 8 lines
Quoted 8 lines

Mea culpa..

So we started this with medfield and the driver construction is pretty much
the same untill skylake. So clubbing under mfld bucket made sense to me.

MID is not flavour of the season now.

Would be, though it covers at least few out of them, MFLD just refers to one.

Quoted 2 lines
Quoted 2 lines

If anyone comes with a better name, am for that :)

_ATOM ? Sounds too broad...

Quoted 1 line
Quoted 7 lines
Quoted 1 line

SND_SST_HIFI2_MOBILE_PLATFORM ?

Where HIFI2 part came from? Any documentation (maybe internal) available to look at? (Because it's not obvious to me how all listed above has something in common)

And I would get rid of _MOBILE part.

SND_SST_ATOM_HIFI2_PLATFORM then

HIFI2 is the DSP version, it's public information for those Field/Trail parts, see https://www.alsa-project.org/main/index.php/Firmware
If you combine HIFI2 with ATOM you have a unique non-ambiguous description of the core+DSP hardware for Medfield through Cherrytrail.

#13 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

Quoted 36 lines · Pierre-Louis Bossart
Quoted 35 lines · Andy Shevchenko
Quoted 14 lines · Pierre-Louis Bossart
Quoted 14 lines
Quoted 13 lines · Andy Shevchenko
Quoted 3 lines

Rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM to make it clear that is
not only about Medfield platform.

Does this change make sense? Medfield was a completely different platform and lumping everything under the same Kconfig option doesn't seem right to me... Plus we've stopped using 'mid' for years, no one would know what it stands for. The only clear architecture feature is the presence of the switch matrix that uniquely identifies all platforms based on Baytrail, Cherrytrail, Merrifield and Anniedale. Medfield/Clovertrail did not expose a switch matrix.

Quoted 8 lines
Quoted 8 lines

Mea culpa..

So we started this with medfield and the driver construction is pretty much
the same untill skylake. So clubbing under mfld bucket made sense to me.

MID is not flavour of the season now.

Would be, though it covers at least few out of them, MFLD just refers to one.

Quoted 2 lines
Quoted 2 lines

If anyone comes with a better name, am for that :)

_ATOM ? Sounds too broad...

Quoted 2 lines

SND_SST_HIFI2_MOBILE_PLATFORM ?

Quoted 7 lines
Quoted 5 lines

Where HIFI2 part came from? Any documentation (maybe internal) available to look at? (Because it's not obvious to me how all listed above has something in common)

And I would get rid of _MOBILE part.

SND_SST_ATOM_HIFI2_PLATFORM then

sounds okay to me..

Quoted 9 lines

HIFI2 is the DSP version, it's public information for those Field/Trail parts, see
https://www.alsa-project.org/main/index.php/Firmware
If you combine HIFI2 with ATOM you have a unique non-ambiguous description of the core+DSP hardware for Medfield through Cherrytrail.

Signature · 1 line
~Vinod
#14 lore raw

Re: [PATCH v3 4/4] ASoC: Intel: rename SND_SST_MFLD_PLATFORM to SND_SST_MID_PLATFORM

Quoted 17 lines · Vinod Koul
Quoted 16 lines · Pierre-Louis Bossart
Quoted 15 lines · Andy Shevchenko

On Tue, 2017-01-03 at 08:18 -0600, Pierre-Louis Bossart wrote:

If anyone comes with a better name, am for that :)

_ATOM ? Sounds too broad...

Quoted 2 lines

SND_SST_HIFI2_MOBILE_PLATFORM ?

Where HIFI2 part came from? Any documentation (maybe internal) available
to look at? (Because it's not obvious to me how all listed above has
something in common)

Quoted 13 lines
Quoted 3 lines
Quoted 1 line

And I would get rid of _MOBILE part.

SND_SST_ATOM_HIFI2_PLATFORM then

sounds okay to me..

Quoted 7 lines

HIFI2 is the DSP version, it's public information for those Field/Trail parts, see
https://www.alsa-project.org/main/index.php/Firmware
If you combine HIFI2 with ATOM you have a unique non-ambiguous description of the core+DSP hardware for Medfield through Cherrytrail.

Agreed. Thanks for suggestion.

I will resend new version with this one fixed.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
maintainer
#6 lore raw

Applied "ASoC: Intel: remove ignored dependencies" to the asoc tree

In reply to Andy Shevchenko

The patch

ASoC: Intel: remove ignored dependencies

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 2914266975fcb09a688cefe98874625366e67c65 Mon Sep 17 00:00:00 2001

From: Andy Shevchenko <[email protected]>
Date: Mon, 16 Jan 2017 15:12:28 +0200
Subject: [PATCH] ASoC: Intel: remove ignored dependencies

For selected only options the explicit dependencies do not make much sense becase Kbuild ignores them anyway. Remove them explicitly.

---
 sound/soc/intel/Kconfig | 1 -
 1 file changed, 1 deletion(-)
sound/soc/intel/Kconfig +0 -1
index 93c41b7219f2..526855ad479e 100644
@@ -31,7 +31,6 @@ config SND_SOC_INTEL_SST
 	tristate
 	select SND_SOC_INTEL_SST_ACPI if ACPI
 	select SND_SOC_INTEL_SST_MATCH if ACPI
-	depends on (X86 || COMPILE_TEST)
 
 config SND_SOC_INTEL_SST_FIRMWARE
 	tristate
Signature · 1 line
2.11.0
maintainer
#4 lore raw

Applied "ASoC: Intel: remove redundant select SND_SOC_INTEL_SST" to the asoc tree

In reply to Andy Shevchenko

The patch

ASoC: Intel: remove redundant select SND_SOC_INTEL_SST

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From dd8275771f7a65dd552137e1839d39e15b313ed2 Mon Sep 17 00:00:00 2001

From: Andy Shevchenko <[email protected]>
Date: Mon, 16 Jan 2017 15:12:27 +0200
Subject: [PATCH] ASoC: Intel: remove redundant select SND_SOC_INTEL_SST

SND_SOC_INTEL_SKYLAKE selects SND_SOC_INTEL_SST already. Thus no need to duplicate. Remove duplications.

---
 sound/soc/intel/Kconfig | 5 -----
 1 file changed, 5 deletions(-)
sound/soc/intel/Kconfig +0 -5
index fd5d1e091038..86766d7c18b0 100644
@@ -68,7 +68,6 @@ config SND_SOC_INTEL_HASWELL_MACH
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 	tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_DA7219
 	select SND_SOC_MAX98357A
@@ -84,7 +83,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 config SND_SOC_INTEL_BXT_RT298_MACH
 	tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_RT298
 	select SND_SOC_DMIC
@@ -220,7 +218,6 @@ config SND_SOC_INTEL_SKYLAKE
 config SND_SOC_INTEL_SKL_RT286_MACH
 	tristate "ASoC Audio driver for SKL with RT286 I2S mode"
 	depends on X86 && ACPI && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_RT286
 	select SND_SOC_DMIC
@@ -234,7 +231,6 @@ config SND_SOC_INTEL_SKL_RT286_MACH
 config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 	tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
 	depends on X86_INTEL_LPSS && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_NAU8825
 	select SND_SOC_SSM4567
@@ -249,7 +245,6 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
 	tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
 	depends on X86_INTEL_LPSS && I2C
-	select SND_SOC_INTEL_SST
 	select SND_SOC_INTEL_SKYLAKE
 	select SND_SOC_NAU8825
 	select SND_SOC_MAX98357A
Signature · 1 line
2.11.0