Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/intel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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

sound/soc/intel/haswell/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
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

sound/soc/intel/sst-haswell-dsp.c→sound/soc/intel/haswell/sst-haswell-dsp.c

+3 −3
Original line number Diff line number Diff line
@@ -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>

sound/soc/intel/sst-haswell-ipc.c→sound/soc/intel/haswell/sst-haswell-ipc.c

+2 −2
Original line number Diff line number Diff line
@@ -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