Browse Source

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: Jie Yang <yang.jie@intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Jie Yang 10 years ago
parent
commit
66a6fd9846

+ 1 - 4
sound/soc/intel/Makefile

@@ -10,10 +10,7 @@ obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
 
 
 # Platform Support
 # Platform Support
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
 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
 # Machine support
 obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/
 obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/

+ 4 - 0
sound/soc/intel/baytrail/Makefile

@@ -0,0 +1,4 @@
+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

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

@@ -22,8 +22,8 @@
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 #include <linux/firmware.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"
 #include "sst-baytrail-ipc.h"
 
 
 #define SST_BYT_FW_SIGNATURE_SIZE	4
 #define SST_BYT_FW_SIGNATURE_SIZE	4

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

@@ -29,8 +29,8 @@
 #include <asm/div64.h>
 #include <asm/div64.h>
 
 
 #include "sst-baytrail-ipc.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 */
 /* IPC message timeout */
 #define IPC_TIMEOUT_MSECS	300
 #define IPC_TIMEOUT_MSECS	300

+ 0 - 0
sound/soc/intel/sst-baytrail-ipc.h → sound/soc/intel/baytrail/sst-baytrail-ipc.h


+ 2 - 2
sound/soc/intel/sst-baytrail-pcm.c → sound/soc/intel/baytrail/sst-baytrail-pcm.c

@@ -20,8 +20,8 @@
 #include <sound/pcm_params.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc.h>
 #include "sst-baytrail-ipc.h"
 #include "sst-baytrail-ipc.h"
-#include "sst-dsp-priv.h"
-#include "sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
 
 
 #define BYT_PCM_COUNT		2
 #define BYT_PCM_COUNT		2