Commit 2106241a authored by Jie Yang's avatar Jie Yang Committed by Mark Brown

ASoC: Intel: create common folder and move common files in

Restructure the sound/soc/intel/ directory: create common folder, and move
sst common files here.
Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2c0ed634
# Core support # Core support
snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
snd-soc-sst-acpi-objs := sst-acpi.o
snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \ snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
sst-mfld-platform-compress.o sst-atom-controls.o sst-mfld-platform-compress.o sst-atom-controls.o
...@@ -9,9 +8,6 @@ snd-soc-mfld-machine-objs := mfld_machine.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_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.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 # Platform Support
snd-soc-sst-haswell-pcm-objs := \ snd-soc-sst-haswell-pcm-objs := \
sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o
......
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
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>"); MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <acpi/actypes.h> #include <acpi/actypes.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
#include "sst.h" #include "sst.h"
struct sst_machines { struct sst_machines {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
struct sst_block *sst_create_block(struct intel_sst_drv *ctx, struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
u32 msg_id, u32 drv_id) u32 msg_id, u32 drv_id)
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
void memcpy32_toio(void __iomem *dst, const void *src, int count) void memcpy32_toio(void __iomem *dst, const void *src, int count)
{ {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
int sst_shim_write(void __iomem *addr, int offset, int value) int sst_shim_write(void __iomem *addr, int offset, int value)
{ {
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../sst-dsp.h" #include "../common/sst-dsp.h"
int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params) int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment