[alsa-devel] [PATCH v2 0/5] Intel SST driver restructure
In order to prepare for the upstreaming of Skylake drivers and to allow reuse of code between different Intel audio DSP products, this patch series restructures the Intel directory as follows:
1. Create "common" directory. Move common files into this directory.
2. Create "boards" directory. Move all machine drivers into this directory.
3. Create "haswell" directory. Move all remaining hsw/bdw code into this directory.
4. Create "baytrail" directory. Move remaining baytrail driver to this directory.
5. Create "atom" directory. Move all MCG platform drivers(including sst/ folder) to this directory.
Changes in v2: add "Reviewed-by" and "Acked-by" items from each platforms' maintainer.
Todo next step: 1. Change and move atom related codes(in atom/sst/) to corresponding and try share as many as possible codes(e.g. sst_acpi.c). 2. Share more common codes about IPC for different platforms, e.g. The methods for queueing and sending/reciving Tx/Rx messages, The methods for mailbox IO, The IPC error return codes, etc.
Jie Yang (5): ASoC: Intel: create common folder and move common files in ASoC: Intel: create haswell folder and move haswell platform files in ASoC: Intel: create boards folder and move sst boards files in ASoC: Intel: create baytrail folder and move baytrail platform files in ASoC: Intel: create atom folder and move atom platform files in
sound/soc/intel/Makefile | 42 +++------------------- sound/soc/intel/atom/Makefile | 7 ++++ sound/soc/intel/{ => atom}/sst-atom-controls.c | 0 sound/soc/intel/{ => atom}/sst-atom-controls.h | 0 sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0 .../intel/{ => atom}/sst-mfld-platform-compress.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform.h | 0 sound/soc/intel/{ => atom}/sst/Makefile | 0 sound/soc/intel/{ => atom}/sst/sst.c | 0 sound/soc/intel/{ => atom}/sst/sst.h | 0 sound/soc/intel/{ => atom}/sst/sst_acpi.c | 0 sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 0 sound/soc/intel/{ => atom}/sst/sst_ipc.c | 0 sound/soc/intel/{ => atom}/sst/sst_loader.c | 0 sound/soc/intel/{ => atom}/sst/sst_pci.c | 0 sound/soc/intel/{ => atom}/sst/sst_pvt.c | 0 sound/soc/intel/{ => atom}/sst/sst_stream.c | 0 sound/soc/intel/baytrail/Makefile | 4 +++ sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0 sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 +-- sound/soc/intel/boards/Makefile | 15 ++++++++ sound/soc/intel/{ => boards}/broadwell.c | 6 ++-- sound/soc/intel/{ => boards}/byt-max98090.c | 2 +- sound/soc/intel/{ => boards}/byt-rt5640.c | 4 +-- .../{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 0 sound/soc/intel/{ => boards}/haswell.c | 6 ++-- sound/soc/intel/{ => boards}/mfld_machine.c | 0 sound/soc/intel/common/Makefile | 6 ++++ sound/soc/intel/{ => common}/sst-acpi.c | 0 sound/soc/intel/{ => common}/sst-dsp-priv.h | 0 sound/soc/intel/{ => common}/sst-dsp.c | 0 sound/soc/intel/{ => common}/sst-dsp.h | 0 sound/soc/intel/{ => common}/sst-firmware.c | 0 sound/soc/intel/haswell/Makefile | 4 +++ sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 6 ++-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 4 +-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 0 sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 6 ++-- 43 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 sound/soc/intel/atom/Makefile rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%) rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (100%) rename sound/soc/intel/{ => atom}/sst/Makefile (100%) rename sound/soc/intel/{ => atom}/sst/sst.c (100%) rename sound/soc/intel/{ => atom}/sst/sst.h (100%) rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_loader.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_stream.c (100%) create mode 100644 sound/soc/intel/baytrail/Makefile rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%) create mode 100644 sound/soc/intel/boards/Makefile rename sound/soc/intel/{ => boards}/broadwell.c (98%) rename sound/soc/intel/{ => boards}/byt-max98090.c (99%) rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%) rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (100%) rename sound/soc/intel/{ => boards}/haswell.c (98%) rename sound/soc/intel/{ => boards}/mfld_machine.c (100%) create mode 100644 sound/soc/intel/common/Makefile rename sound/soc/intel/{ => common}/sst-acpi.c (100%) rename sound/soc/intel/{ => common}/sst-dsp-priv.h (100%) rename sound/soc/intel/{ => common}/sst-dsp.c (100%) rename sound/soc/intel/{ => common}/sst-dsp.h (100%) rename sound/soc/intel/{ => common}/sst-firmware.c (100%) create mode 100644 sound/soc/intel/haswell/Makefile rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (100%) rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (99%)
Restructure the sound/soc/intel/ directory: create common folder, and move sst common files here.
Signed-off-by: Jie Yang yang.jie@intel.com Acked-by: Jarkko Nikula jarkko.nikula@linux.intel.com Tested-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- sound/soc/intel/Makefile | 6 +----- sound/soc/intel/common/Makefile | 6 ++++++ sound/soc/intel/{ => common}/sst-acpi.c | 0 sound/soc/intel/{ => common}/sst-dsp-priv.h | 0 sound/soc/intel/{ => common}/sst-dsp.c | 0 sound/soc/intel/{ => common}/sst-dsp.h | 0 sound/soc/intel/{ => common}/sst-firmware.c | 0 7 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 sound/soc/intel/common/Makefile rename sound/soc/intel/{ => common}/sst-acpi.c (100%) rename sound/soc/intel/{ => common}/sst-dsp-priv.h (100%) rename sound/soc/intel/{ => common}/sst-dsp.c (100%) rename sound/soc/intel/{ => common}/sst-dsp.h (100%) rename sound/soc/intel/{ => common}/sst-firmware.c (100%)
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index a8e53c4..28de8cd 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -1,6 +1,5 @@ # Core support -snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o -snd-soc-sst-acpi-objs := sst-acpi.o +obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \ sst-mfld-platform-compress.o sst-atom-controls.o @@ -9,9 +8,6 @@ snd-soc-mfld-machine-objs := mfld_machine.o obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
-obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o -obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o - # Platform Support snd-soc-sst-haswell-pcm-objs := \ sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile new file mode 100644 index 0000000..3df0e1c --- /dev/null +++ b/sound/soc/intel/common/Makefile @@ -0,0 +1,6 @@ +snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o +snd-soc-sst-acpi-objs := sst-acpi.o + +obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o +obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o + diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c similarity index 100% rename from sound/soc/intel/sst-acpi.c rename to sound/soc/intel/common/sst-acpi.c diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h similarity index 100% rename from sound/soc/intel/sst-dsp-priv.h rename to sound/soc/intel/common/sst-dsp-priv.h diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c similarity index 100% rename from sound/soc/intel/sst-dsp.c rename to sound/soc/intel/common/sst-dsp.c diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h similarity index 100% rename from sound/soc/intel/sst-dsp.h rename to sound/soc/intel/common/sst-dsp.h diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c similarity index 100% rename from sound/soc/intel/sst-firmware.c rename to sound/soc/intel/common/sst-firmware.c
Restructure the sound/soc/intel/ directory: create haswell folder, and move haswell platform files here.
Signed-off-by: Jie Yang yang.jie@intel.com Reviewed-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- sound/soc/intel/Makefile | 4 +--- sound/soc/intel/haswell/Makefile | 4 ++++ sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 6 +++--- sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 4 ++-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 0 sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 sound/soc/intel/haswell/Makefile rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (100%) rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (99%)
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 28de8cd..eb3efce 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -9,12 +9,10 @@ obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
# Platform Support -snd-soc-sst-haswell-pcm-objs := \ - sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o +obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ snd-soc-sst-baytrail-pcm-objs := \ sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o
-obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
# Machine support diff --git a/sound/soc/intel/haswell/Makefile b/sound/soc/intel/haswell/Makefile new file mode 100644 index 0000000..9c17231 --- /dev/null +++ b/sound/soc/intel/haswell/Makefile @@ -0,0 +1,4 @@ +snd-soc-sst-haswell-pcm-objs := \ + sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o + +obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/haswell/sst-haswell-dsp.c similarity index 99% rename from sound/soc/intel/sst-haswell-dsp.c rename to sound/soc/intel/haswell/sst-haswell-dsp.c index b3e957d..7f94920 100644 --- a/sound/soc/intel/sst-haswell-dsp.c +++ b/sound/soc/intel/haswell/sst-haswell-dsp.c @@ -28,9 +28,9 @@ #include <linux/firmware.h> #include <linux/pm_runtime.h>
-#include "sst-dsp.h" -#include "sst-dsp-priv.h" -#include "sst-haswell-ipc.h" +#include "../common/sst-dsp.h" +#include "../common/sst-dsp-priv.h" +#include "../haswell/sst-haswell-ipc.h"
#include <trace/events/hswadsp.h>
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c similarity index 99% rename from sound/soc/intel/sst-haswell-ipc.c rename to sound/soc/intel/haswell/sst-haswell-ipc.c index 20b629a..28667d8 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -34,8 +34,8 @@ #include <sound/asound.h>
#include "sst-haswell-ipc.h" -#include "sst-dsp.h" -#include "sst-dsp-priv.h" +#include "../common/sst-dsp.h" +#include "../common/sst-dsp-priv.h"
/* Global Message - Generic */ #define IPC_GLB_TYPE_SHIFT 24 diff --git a/sound/soc/intel/sst-haswell-ipc.h b/sound/soc/intel/haswell/sst-haswell-ipc.h similarity index 100% rename from sound/soc/intel/sst-haswell-ipc.h rename to sound/soc/intel/haswell/sst-haswell-ipc.h diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c similarity index 99% rename from sound/soc/intel/sst-haswell-pcm.c rename to sound/soc/intel/haswell/sst-haswell-pcm.c index 31ffc0f..157b3a6 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -29,9 +29,9 @@ #include <sound/tlv.h> #include <sound/compress_driver.h>
-#include "sst-haswell-ipc.h" -#include "sst-dsp-priv.h" -#include "sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" +#include "../common/sst-dsp-priv.h" +#include "../common/sst-dsp.h"
#define HSW_PCM_COUNT 6 #define HSW_VOLUME_MAX 0x7FFFFFFF /* 0dB */
Restructure the sound/soc/intel/ directory: create boards folder, and move sst boards files here.
Signed-off-by: Jie Yang yang.jie@intel.com Acked-by: Vinod Koul vinod.koul@intel.com Acked-by: Jarkko Nikula jarkko.nikula@linux.intel.com Tested-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- sound/soc/intel/Makefile | 16 +--------------- sound/soc/intel/boards/Makefile | 15 +++++++++++++++ sound/soc/intel/{ => boards}/broadwell.c | 6 +++--- sound/soc/intel/{ => boards}/byt-max98090.c | 2 +- sound/soc/intel/{ => boards}/byt-rt5640.c | 4 ++-- .../intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 0 sound/soc/intel/{ => boards}/haswell.c | 6 +++--- sound/soc/intel/{ => boards}/mfld_machine.c | 0 10 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 sound/soc/intel/boards/Makefile rename sound/soc/intel/{ => boards}/broadwell.c (98%) rename sound/soc/intel/{ => boards}/byt-max98090.c (99%) rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%) rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (100%) rename sound/soc/intel/{ => boards}/haswell.c (98%) rename sound/soc/intel/{ => boards}/mfld_machine.c (100%)
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index eb3efce..ac0248f 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -16,21 +16,7 @@ snd-soc-sst-baytrail-pcm-objs := \ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
# Machine support -snd-soc-sst-haswell-objs := haswell.o -snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o -snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o -snd-soc-sst-broadwell-objs := broadwell.o -snd-soc-sst-bytcr-dpcm-rt5640-objs := bytcr_dpcm_rt5640.o -snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o -snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o - -obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o -obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o -obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o -obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o -obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-dpcm-rt5640.o -obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o -obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o +obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/
# DSP driver obj-$(CONFIG_SND_SST_IPC) += sst/ diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile new file mode 100644 index 0000000..f8237f0 --- /dev/null +++ b/sound/soc/intel/boards/Makefile @@ -0,0 +1,15 @@ +snd-soc-sst-haswell-objs := haswell.o +snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o +snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-broadwell-objs := broadwell.o +snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o +snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o +snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o + +obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o +obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o +obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o +obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o +obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o +obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/boards/broadwell.c similarity index 98% rename from sound/soc/intel/broadwell.c rename to sound/soc/intel/boards/broadwell.c index 6c75b6b..8bafaf6 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -22,10 +22,10 @@ #include <sound/jack.h> #include <sound/pcm_params.h>
-#include "sst-dsp.h" -#include "sst-haswell-ipc.h" +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h"
-#include "../codecs/rt286.h" +#include "../../codecs/rt286.h"
static struct snd_soc_jack broadwell_headset; /* Headset jack detection DAPM pins */ diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/boards/byt-max98090.c similarity index 99% rename from sound/soc/intel/byt-max98090.c rename to sound/soc/intel/boards/byt-max98090.c index d8b1f03..7ab8cc9 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/boards/byt-max98090.c @@ -24,7 +24,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> -#include "../codecs/max98090.h" +#include "../../codecs/max98090.h"
struct byt_max98090_private { struct snd_soc_jack jack; diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/boards/byt-rt5640.c similarity index 98% rename from sound/soc/intel/byt-rt5640.c rename to sound/soc/intel/boards/byt-rt5640.c index 354eaad..ae89b9b9 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/boards/byt-rt5640.c @@ -23,9 +23,9 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/jack.h> -#include "../codecs/rt5640.h" +#include "../../codecs/rt5640.h"
-#include "sst-dsp.h" +#include "../common/sst-dsp.h"
static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = { SND_SOC_DAPM_HP("Headphone", NULL), diff --git a/sound/soc/intel/bytcr_dpcm_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c similarity index 100% rename from sound/soc/intel/bytcr_dpcm_rt5640.c rename to sound/soc/intel/boards/bytcr_rt5640.c diff --git a/sound/soc/intel/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c similarity index 100% rename from sound/soc/intel/cht_bsw_rt5645.c rename to sound/soc/intel/boards/cht_bsw_rt5645.c diff --git a/sound/soc/intel/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c similarity index 100% rename from sound/soc/intel/cht_bsw_rt5672.c rename to sound/soc/intel/boards/cht_bsw_rt5672.c diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/boards/haswell.c similarity index 98% rename from sound/soc/intel/haswell.c rename to sound/soc/intel/boards/haswell.c index 00fddd3..2255857 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -21,10 +21,10 @@ #include <sound/soc.h> #include <sound/pcm_params.h>
-#include "sst-dsp.h" -#include "sst-haswell-ipc.h" +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h"
-#include "../codecs/rt5640.h" +#include "../../codecs/rt5640.h"
/* Haswell ULT platforms have a Headphone and Mic jack */ static const struct snd_soc_dapm_widget haswell_widgets[] = { diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c similarity index 100% rename from sound/soc/intel/mfld_machine.c rename to sound/soc/intel/boards/mfld_machine.c
Restructure the sound/soc/intel/ directory: create baytrail folder, and move sst baytrail platform files here.
Signed-off-by: Jie Yang yang.jie@intel.com Acked-by: Jarkko Nikula jarkko.nikula@linux.intel.com Tested-by: Jarkko Nikula jarkko.nikula@linux.intel.com --- sound/soc/intel/Makefile | 5 +---- sound/soc/intel/baytrail/Makefile | 4 ++++ sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 ++-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 4 ++-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0 sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 sound/soc/intel/baytrail/Makefile rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%)
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index ac0248f..62de82a 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -10,10 +10,7 @@ obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
# Platform Support obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ -snd-soc-sst-baytrail-pcm-objs := \ - sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o - -obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o +obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
# Machine support obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/ diff --git a/sound/soc/intel/baytrail/Makefile b/sound/soc/intel/baytrail/Makefile new file mode 100644 index 0000000..488408c --- /dev/null +++ b/sound/soc/intel/baytrail/Makefile @@ -0,0 +1,4 @@ +snd-soc-sst-baytrail-pcm-objs := \ + sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o + +obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/baytrail/sst-baytrail-dsp.c similarity index 99% rename from sound/soc/intel/sst-baytrail-dsp.c rename to sound/soc/intel/baytrail/sst-baytrail-dsp.c index 5a9e567..01d023c 100644 --- a/sound/soc/intel/sst-baytrail-dsp.c +++ b/sound/soc/intel/baytrail/sst-baytrail-dsp.c @@ -22,8 +22,8 @@ #include <linux/platform_device.h> #include <linux/firmware.h>
-#include "sst-dsp.h" -#include "sst-dsp-priv.h" +#include "../common/sst-dsp.h" +#include "../common/sst-dsp-priv.h" #include "sst-baytrail-ipc.h"
#define SST_BYT_FW_SIGNATURE_SIZE 4 diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/baytrail/sst-baytrail-ipc.c similarity index 99% rename from sound/soc/intel/sst-baytrail-ipc.c rename to sound/soc/intel/baytrail/sst-baytrail-ipc.c index b4ad98c..aabb9b0 100644 --- a/sound/soc/intel/sst-baytrail-ipc.c +++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c @@ -29,8 +29,8 @@ #include <asm/div64.h>
#include "sst-baytrail-ipc.h" -#include "sst-dsp.h" -#include "sst-dsp-priv.h" +#include "../common/sst-dsp.h" +#include "../common/sst-dsp-priv.h"
/* IPC message timeout */ #define IPC_TIMEOUT_MSECS 300 diff --git a/sound/soc/intel/sst-baytrail-ipc.h b/sound/soc/intel/baytrail/sst-baytrail-ipc.h similarity index 100% rename from sound/soc/intel/sst-baytrail-ipc.h rename to sound/soc/intel/baytrail/sst-baytrail-ipc.h diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/baytrail/sst-baytrail-pcm.c similarity index 99% rename from sound/soc/intel/sst-baytrail-pcm.c rename to sound/soc/intel/baytrail/sst-baytrail-pcm.c index 224c49c..79547be 100644 --- a/sound/soc/intel/sst-baytrail-pcm.c +++ b/sound/soc/intel/baytrail/sst-baytrail-pcm.c @@ -20,8 +20,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include "sst-baytrail-ipc.h" -#include "sst-dsp-priv.h" -#include "sst-dsp.h" +#include "../common/sst-dsp-priv.h" +#include "../common/sst-dsp.h"
#define BYT_PCM_COUNT 2
Restructure the sound/soc/intel/ directory: create atom folder, and move sst atom platform files here.
Signed-off-by: Jie Yang yang.jie@intel.com Acked-by: Vinod Koul vinod.koul@intel.com --- sound/soc/intel/Makefile | 11 +---------- sound/soc/intel/atom/Makefile | 7 +++++++ sound/soc/intel/{ => atom}/sst-atom-controls.c | 0 sound/soc/intel/{ => atom}/sst-atom-controls.h | 0 sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform.h | 0 sound/soc/intel/{ => atom}/sst/Makefile | 0 sound/soc/intel/{ => atom}/sst/sst.c | 0 sound/soc/intel/{ => atom}/sst/sst.h | 0 sound/soc/intel/{ => atom}/sst/sst_acpi.c | 0 sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 0 sound/soc/intel/{ => atom}/sst/sst_ipc.c | 0 sound/soc/intel/{ => atom}/sst/sst_loader.c | 0 sound/soc/intel/{ => atom}/sst/sst_pci.c | 0 sound/soc/intel/{ => atom}/sst/sst_pvt.c | 0 sound/soc/intel/{ => atom}/sst/sst_stream.c | 0 18 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 sound/soc/intel/atom/Makefile rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%) rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (100%) rename sound/soc/intel/{ => atom}/sst/Makefile (100%) rename sound/soc/intel/{ => atom}/sst/sst.c (100%) rename sound/soc/intel/{ => atom}/sst/sst.h (100%) rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_loader.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_stream.c (100%)
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 62de82a..cd9aee9 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -1,19 +1,10 @@ # Core support obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
-snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \ - sst-mfld-platform-compress.o sst-atom-controls.o -snd-soc-mfld-machine-objs := mfld_machine.o - -obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o -obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o - # Platform Support obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ +obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += atom/
# Machine support obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/ - -# DSP driver -obj-$(CONFIG_SND_SST_IPC) += sst/ diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile new file mode 100644 index 0000000..ce8074f --- /dev/null +++ b/sound/soc/intel/atom/Makefile @@ -0,0 +1,7 @@ +snd-soc-sst-mfld-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 + +# DSP driver +obj-$(CONFIG_SND_SST_IPC) += sst/ diff --git a/sound/soc/intel/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c similarity index 100% rename from sound/soc/intel/sst-atom-controls.c rename to sound/soc/intel/atom/sst-atom-controls.c diff --git a/sound/soc/intel/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h similarity index 100% rename from sound/soc/intel/sst-atom-controls.h rename to sound/soc/intel/atom/sst-atom-controls.h diff --git a/sound/soc/intel/sst-mfld-dsp.h b/sound/soc/intel/atom/sst-mfld-dsp.h similarity index 100% rename from sound/soc/intel/sst-mfld-dsp.h rename to sound/soc/intel/atom/sst-mfld-dsp.h diff --git a/sound/soc/intel/sst-mfld-platform-compress.c b/sound/soc/intel/atom/sst-mfld-platform-compress.c similarity index 100% rename from sound/soc/intel/sst-mfld-platform-compress.c rename to sound/soc/intel/atom/sst-mfld-platform-compress.c diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c similarity index 100% rename from sound/soc/intel/sst-mfld-platform-pcm.c rename to sound/soc/intel/atom/sst-mfld-platform-pcm.c diff --git a/sound/soc/intel/sst-mfld-platform.h b/sound/soc/intel/atom/sst-mfld-platform.h similarity index 100% rename from sound/soc/intel/sst-mfld-platform.h rename to sound/soc/intel/atom/sst-mfld-platform.h diff --git a/sound/soc/intel/sst/Makefile b/sound/soc/intel/atom/sst/Makefile similarity index 100% rename from sound/soc/intel/sst/Makefile rename to sound/soc/intel/atom/sst/Makefile diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/atom/sst/sst.c similarity index 100% rename from sound/soc/intel/sst/sst.c rename to sound/soc/intel/atom/sst/sst.c diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/atom/sst/sst.h similarity index 100% rename from sound/soc/intel/sst/sst.h rename to sound/soc/intel/atom/sst/sst.h diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c similarity index 100% rename from sound/soc/intel/sst/sst_acpi.c rename to sound/soc/intel/atom/sst/sst_acpi.c diff --git a/sound/soc/intel/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c similarity index 100% rename from sound/soc/intel/sst/sst_drv_interface.c rename to sound/soc/intel/atom/sst/sst_drv_interface.c diff --git a/sound/soc/intel/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c similarity index 100% rename from sound/soc/intel/sst/sst_ipc.c rename to sound/soc/intel/atom/sst/sst_ipc.c diff --git a/sound/soc/intel/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c similarity index 100% rename from sound/soc/intel/sst/sst_loader.c rename to sound/soc/intel/atom/sst/sst_loader.c diff --git a/sound/soc/intel/sst/sst_pci.c b/sound/soc/intel/atom/sst/sst_pci.c similarity index 100% rename from sound/soc/intel/sst/sst_pci.c rename to sound/soc/intel/atom/sst/sst_pci.c diff --git a/sound/soc/intel/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c similarity index 100% rename from sound/soc/intel/sst/sst_pvt.c rename to sound/soc/intel/atom/sst/sst_pvt.c diff --git a/sound/soc/intel/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c similarity index 100% rename from sound/soc/intel/sst/sst_stream.c rename to sound/soc/intel/atom/sst/sst_stream.c
On Wed, Apr 01, 2015 at 03:42:18PM +0800, Jie Yang wrote:
In order to prepare for the upstreaming of Skylake drivers and to allow reuse of code between different Intel audio DSP products, this patch series restructures the Intel directory as follows:
I've reverted these due to a series of build failures reported by the 0day tester.
participants (2)
-
Jie Yang -
Mark Brown