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

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

Restructure the sound/soc/intel/ directory: create atom folder, and move
sst atom platform files here.
Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 66a6fd98
# Core support # Core support
obj-$(CONFIG_SND_SOC_INTEL_SST) += common/ obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
sst-mfld-platform-compress.o sst-atom-controls.o
snd-soc-mfld-machine-objs := mfld_machine.o
obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
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/
obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += atom/
# Machine support # Machine support
obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/ obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/
# DSP driver
obj-$(CONFIG_SND_SST_IPC) += sst/
snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
sst-mfld-platform-compress.o sst-atom-controls.o
obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
# DSP driver
obj-$(CONFIG_SND_SST_IPC) += sst/
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>"); MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <acpi/actypes.h> #include <acpi/actypes.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
#include "sst.h" #include "sst.h"
struct sst_machines { struct sst_machines {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
struct sst_block *sst_create_block(struct intel_sst_drv *ctx, struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
u32 msg_id, u32 drv_id) u32 msg_id, u32 drv_id)
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
void memcpy32_toio(void __iomem *dst, const void *src, int count) void memcpy32_toio(void __iomem *dst, const void *src, int count)
{ {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
int sst_shim_write(void __iomem *addr, int offset, int value) int sst_shim_write(void __iomem *addr, int offset, int value)
{ {
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/platform_sst_audio.h> #include <asm/platform_sst_audio.h>
#include "../sst-mfld-platform.h" #include "../sst-mfld-platform.h"
#include "sst.h" #include "sst.h"
#include "../common/sst-dsp.h" #include "../../common/sst-dsp.h"
int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params) int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
{ {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include "../../codecs/rt5640.h" #include "../../codecs/rt5640.h"
#include "../sst-atom-controls.h" #include "../atom/sst-atom-controls.h"
static const struct snd_soc_dapm_widget byt_dapm_widgets[] = { static const struct snd_soc_dapm_widget byt_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_HP("Headphone", NULL),
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include "../../codecs/rt5645.h" #include "../../codecs/rt5645.h"
#include "../sst-atom-controls.h" #include "../atom/sst-atom-controls.h"
#define CHT_PLAT_CLK_3_HZ 19200000 #define CHT_PLAT_CLK_3_HZ 19200000
#define CHT_CODEC_DAI "rt5645-aif1" #define CHT_CODEC_DAI "rt5645-aif1"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include "../../codecs/rt5670.h" #include "../../codecs/rt5670.h"
#include "../sst-atom-controls.h" #include "../atom/sst-atom-controls.h"
/* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */ /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
#define CHT_PLAT_CLK_3_HZ 19200000 #define CHT_PLAT_CLK_3_HZ 19200000
......
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