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

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

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



Restructure the sound/soc/intel/ directory: create baytrail folder, and move
sst baytrail platform 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 e56c72d5

sound/soc/intel/Makefile

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

sound/soc/intel/baytrail/Makefile

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

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

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

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

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