leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jie Yang 2015-04-02 15:37:01 +08:00 committed by Mark Brown
parent 2106241a68
commit ba57f68235
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/intel/Makefile
View File

@ -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

4
sound/soc/intel/haswell/Makefile Normal file
View File

@ -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

6
sound/soc/intel/sst-haswell-dsp.c → sound/soc/intel/haswell/sst-haswell-dsp.c
View File

@ -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>

4
sound/soc/intel/sst-haswell-ipc.c → sound/soc/intel/haswell/sst-haswell-ipc.c
View File

@ -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

0
sound/soc/intel/sst-haswell-ipc.h → sound/soc/intel/haswell/sst-haswell-ipc.h
View File

6
sound/soc/intel/sst-haswell-pcm.c → sound/soc/intel/haswell/sst-haswell-pcm.c
View File

@ -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 */