ASoC: Intel: Add a mfld prefix to Intel SST drivers.
Subsystems (3)
Liam Girdwood
maintainerPATCH 1/1 ASoC: Intel: Add a mfld prefix to Intel SST drivers.
Resent with correct email for Mark.
In order to differentiate the different Intel SST audio core drivers we need to rename the current drivers with a mfld prefix. This also includes renaming in the Makefile and Kconfig
Acked-by Vinod Koul <[email protected]>
Signed-off-by Liam Girdwood <[email protected]>
---
sound/soc/intel/Kconfig | 4 ++--
sound/soc/intel/Makefile | 4 ++--
sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} | 8 ++++----
sound/soc/intel/{sst_platform.c => sst-mfld-platform.c} | 8 ++++----
sound/soc/intel/{sst_platform.h => sst-mfld-platform.h} | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
rename sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} (96%)
rename sound/soc/intel/{sst_platform.c => sst-mfld-platform.c} (99%)
rename sound/soc/intel/{sst_platform.h => sst-mfld-platform.h} (97%)sound/soc/intel/Kconfig +2 -2
@@ -2,12 +2,12 @@ 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_PLATFORM + select SND_SST_MFLD_PLATFORM help This adds support for ASoC machine driver for Intel(R) MID Medfield platform used as alsa device in audio substem in Intel(R) MID devices Say Y if you have such a device If unsure select "N". -config SND_SST_PLATFORM +config SND_SST_MFLD_PLATFORM tristate
sound/soc/intel/Makefile +2 -2
@@ -1,5 +1,5 @@ -snd-soc-sst-platform-objs := sst_platform.o +snd-soc-sst-mfld-platform-objs := sst-mfld-platform.o snd-soc-mfld-machine-objs := mfld_machine.o -obj-$(CONFIG_SND_SST_PLATFORM) += snd-soc-sst-platform.o +obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
sound/soc/intel/sst-mfld-dsp.h renamed from sound/soc/intel/sst_dsp.h +4 -4
@@ -1,7 +1,7 @@ -#ifndef __SST_DSP_H__ -#define __SST_DSP_H__ +#ifndef __SST_MFLD_DSP_H__ +#define __SST_MFLD_DSP_H__/* -* sst_dsp.h - Intel SST Driver for audio engine +* sst_mfld_dsp.h - Intel SST Driver for audio engine * * Copyright (C) 2008-12 Intel Corporation * Authors: Vinod Koul <[email protected]>
@@ -131,4 +131,4 @@ struct snd_sst_params { struct snd_sst_alloc_params_ext aparams; }; -#endif /* __SST_DSP_H__ */ +#endif /* __SST_MFLD_DSP_H__ */
sound/soc/intel/sst-mfld-platform.c renamed from sound/soc/intel/sst_platform.c +4 -4
@@ -1,5 +1,5 @@/* -* sst_platform.c - Intel MID Platform driver +* sst_mfld_platform.c - Intel MID Platform driver * * Copyright (C) 2010-2013 Intel Corp * Author: Vinod Koul <[email protected]>
@@ -33,7 +33,7 @@#include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/compress_driver.h> -#include "sst_platform.h" +#include "sst-mfld-platform.h" static struct sst_device *sst;static DEFINE_MUTEX (sst_lock);
@@ -709,7 +709,7 @@ static int sst_platform_remove(struct platform_device *pdev)static struct platform_driver sst_platform_driver = { .driver = { - .name ="sst-platform" , + .name ="sst-mfld-platform" , .owner =THIS_MODULE , }, .probe = sst_platform_probe,
@@ -722,4 +722,4 @@ MODULE_DESCRIPTION("ASoC Intel(R) MID Platform driver");MODULE_AUTHOR ("Vinod Koul <[email protected]>" );MODULE_AUTHOR ("Harsha Priya <[email protected]>" );MODULE_LICENSE ("GPL v2" ); -MODULE_ALIAS ("platform:sst-platform" ); +MODULE_ALIAS ("platform:sst-mfld-platform" );
sound/soc/intel/sst-mfld-platform.h renamed from sound/soc/intel/sst_platform.h +2 -2
@@ -1,5 +1,5 @@/* -* sst_platform.h - Intel MID Platform driver header file +* sst_mfld_platform.h - Intel MID Platform driver header file * * Copyright (C) 2010 Intel Corp * Author: Vinod Koul <[email protected]>
@@ -27,7 +27,7 @@#ifndef __SST_PLATFORMDRV_H__#define __SST_PLATFORMDRV_H__ -#include "sst_dsp.h" +#include "sst-mfld-dsp.h" #define SST_MONO 1#define SST_STEREO 2
Signature · 1 line
1.8.3.2
Quoted 5 lines · Liam Girdwood
Resent with correct email for Mark.
In order to differentiate the different Intel SST audio core drivers we need to rename the current drivers with a mfld prefix. This also includes renaming in the
MakefileandKconfig
Applied, thanks.