diff mbox

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

Message ID 20170102152017.13938-5-andriy.shevchenko@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andy Shevchenko Jan. 2, 2017, 3:20 p.m. UTC
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(-)

Comments

Pierre-Louis Bossart Jan. 2, 2017, 4:05 p.m. UTC | #1
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/
Vinod Koul Jan. 3, 2017, 3:38 a.m. UTC | #2
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 :)
Pierre-Louis Bossart Jan. 3, 2017, 2:18 p.m. UTC | #3
>> 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 ?
Andy Shevchenko Jan. 4, 2017, 10:44 a.m. UTC | #4
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.
Pierre-Louis Bossart Jan. 4, 2017, 4:58 p.m. UTC | #5
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.
Vinod Koul Jan. 5, 2017, 3:53 a.m. UTC | #6
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.
> 
>
Andy Shevchenko Jan. 5, 2017, 8:41 a.m. UTC | #7
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.
diff mbox

Patch

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/