Commit ba57f682 authored by Jie Yang's avatar Jie Yang Committed by Mark Brown

ASoC: Intel: create haswell folder and move haswell platform files in

Restructure the sound/soc/intel/ directory: create haswell folder, and
move haswell platform files here.
Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Reviewed-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2106241a
...@@ -9,12 +9,10 @@ obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o ...@@ -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 obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
# Platform Support # Platform Support
snd-soc-sst-haswell-pcm-objs := \ obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o
snd-soc-sst-baytrail-pcm-objs := \ snd-soc-sst-baytrail-pcm-objs := \
sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o 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 obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
# Machine support # Machine 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) += snd-soc-sst-haswell-pcm.o
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include "sst-dsp.h" #include "../common/sst-dsp.h"
#include "sst-dsp-priv.h" #include "../common/sst-dsp-priv.h"
#include "sst-haswell-ipc.h" #include "../haswell/sst-haswell-ipc.h"
#include <trace/events/hswadsp.h> #include <trace/events/hswadsp.h>
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include <sound/asound.h> #include <sound/asound.h>
#include "sst-haswell-ipc.h" #include "sst-haswell-ipc.h"
#include "sst-dsp.h" #include "../common/sst-dsp.h"
#include "sst-dsp-priv.h" #include "../common/sst-dsp-priv.h"
/* Global Message - Generic */ /* Global Message - Generic */
#define IPC_GLB_TYPE_SHIFT 24 #define IPC_GLB_TYPE_SHIFT 24
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <sound/tlv.h> #include <sound/tlv.h>
#include <sound/compress_driver.h> #include <sound/compress_driver.h>
#include "sst-haswell-ipc.h" #include "../haswell/sst-haswell-ipc.h"
#include "sst-dsp-priv.h" #include "../common/sst-dsp-priv.h"
#include "sst-dsp.h" #include "../common/sst-dsp.h"
#define HSW_PCM_COUNT 6 #define HSW_PCM_COUNT 6
#define HSW_VOLUME_MAX 0x7FFFFFFF /* 0dB */ #define HSW_VOLUME_MAX 0x7FFFFFFF /* 0dB */
......
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