[PATCH v3 0/4] ASoC: Intel: clean up Kconfig

[PATCH v3 0/4] ASoC: Intel: clean up Kconfig

[Andy Shevchenko]

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(-)

-- 
2.11.0

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

[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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 sound/soc/intel/Kconfig | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index fd5d1e091038..3da3b28b70e1 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.11.0

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

[Keyon Jie]

On 2017年01月02日 23:20, Andy Shevchenko wrote:
> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Keyon Jie <yang.jie@linux.intel.com>

thanks,
~Keyon

> ---
>   sound/soc/intel/Kconfig | 26 ++++++++------------------
>   1 file changed, 8 insertions(+), 18 deletions(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index fd5d1e091038..3da3b28b70e1 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -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
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

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

[Andy Shevchenko]

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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 sound/soc/intel/Kconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 3da3b28b70e1..7b60689a22d4 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.11.0

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

[Mark Brown]

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

>From dd8275771f7a65dd552137e1839d39e15b313ed2 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
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.

Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index fd5d1e091038..86766d7c18b0 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.11.0

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

[Andy Shevchenko]

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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 sound/soc/intel/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7b60689a22d4..7da8b9ceb728 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.11.0

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

[Mark Brown]

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

>From 2914266975fcb09a688cefe98874625366e67c65 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
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.

Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 93c41b7219f2..526855ad479e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
-- 
2.11.0

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

[Andy Shevchenko]

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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 sound/soc/intel/Kconfig       | 14 +++++++-------
 sound/soc/intel/Makefile      |  2 +-
 sound/soc/intel/atom/Makefile |  7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7da8b9ceb728..c44da83c71a8 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index 2b45435e6245..58578f8a3b45 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -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
diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile
index ce8074fa6d66..a1f2f1ba158d 100644
--- a/sound/soc/intel/atom/Makefile
+++ b/sound/soc/intel/atom/Makefile
@@ -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/
-- 
2.11.0

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

[Pierre-Louis Bossart]

On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>   sound/soc/intel/Kconfig       | 14 +++++++-------
>   sound/soc/intel/Makefile      |  2 +-
>   sound/soc/intel/atom/Makefile |  7 ++++---
>   3 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 7da8b9ceb728..c44da83c71a8 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -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
> diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
> index 2b45435e6245..58578f8a3b45 100644
> --- a/sound/soc/intel/Makefile
> +++ b/sound/soc/intel/Makefile
> @@ -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
> diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile
> index ce8074fa6d66..a1f2f1ba158d 100644
> --- a/sound/soc/intel/atom/Makefile
> +++ b/sound/soc/intel/atom/Makefile
> @@ -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/

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

[Vinod Koul]

On Mon, Jan 02, 2017 at 10:05:40AM -0600, Pierre-Louis Bossart wrote:
> 
> 
> On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
> >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.

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 :)

-- 
~Vinod

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

[Pierre-Louis Bossart]

>> On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
>>> 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.
> 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 ?

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

[Andy Shevchenko]

On Tue, 2017-01-03 at 08:18 -0600, Pierre-Louis Bossart wrote:
> > > On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
> > > > 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.
> > 
> > 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.

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

_ATOM ? Sounds too broad...

> 
> 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.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

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

[Pierre-Louis Bossart]

On 1/4/17 4:44 AM, Andy Shevchenko wrote:
> On Tue, 2017-01-03 at 08:18 -0600, Pierre-Louis Bossart wrote:
>>>> On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
>>>>> 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.
>>>
>>> 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.
>
>>>
>>> If anyone comes with a better name, am for that :)
>
> _ATOM ? Sounds too broad...
>
>>
>> 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.

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

[Vinod Koul]

On Wed, Jan 04, 2017 at 10:58:50AM -0600, Pierre-Louis Bossart wrote:
> On 1/4/17 4:44 AM, Andy Shevchenko wrote:
> >On Tue, 2017-01-03 at 08:18 -0600, Pierre-Louis Bossart wrote:
> >>>>On 01/02/2017 09:20 AM, Andy Shevchenko wrote:
> >>>>>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.
> >>>
> >>>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.
> >
> >>>
> >>>If anyone comes with a better name, am for that :)
> >
> >_ATOM ? Sounds too broad...
> >
> >>
> >>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

sounds okay to me..

> 
> 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.
> 
> 

-- 
~Vinod

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

[Andy Shevchenko]

On Thu, 2017-01-05 at 09:23 +0530, Vinod Koul wrote:
> On Wed, Jan 04, 2017 at 10:58:50AM -0600, Pierre-Louis Bossart wrote:
> > On 1/4/17 4:44 AM, Andy Shevchenko wrote:
> > > 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...
> > > 
> > > > 
> > > > 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
> 
> sounds okay to me..
> 
> > 
> > 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.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy