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

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

ASoC: Intel: create boards folder and move sst boards files in 



Restructure the sound/soc/intel/ directory: create boards folder, and move
sst boards files here.

Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@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 ba57f682

sound/soc/intel/Makefile

+1 −15
Original line number Original line Diff line number Diff line
@@ -16,21 +16,7 @@ snd-soc-sst-baytrail-pcm-objs := \ 
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

snd-soc-sst-haswell-objs := haswell.o

obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/

snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o

snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o

snd-soc-sst-broadwell-objs := broadwell.o

snd-soc-sst-bytcr-dpcm-rt5640-objs := bytcr_dpcm_rt5640.o

snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o

snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o



obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o

obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-dpcm-rt5640.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o





# DSP driver

# DSP driver

obj-$(CONFIG_SND_SST_IPC) += sst/
 
obj-$(CONFIG_SND_SST_IPC) += sst/

sound/soc/intel/boards/Makefile

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
snd-soc-sst-haswell-objs := haswell.o

snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o

snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o

snd-soc-sst-broadwell-objs := broadwell.o

snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o

snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o

snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o



obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o

obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o

obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o

obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o

sound/soc/intel/broadwell.c→sound/soc/intel/boards/broadwell.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <sound/jack.h>

#include <sound/jack.h>

#include <sound/pcm_params.h>

#include <sound/pcm_params.h>





#include "sst-dsp.h"

#include "../common/sst-dsp.h"

#include "sst-haswell-ipc.h"

#include "../haswell/sst-haswell-ipc.h"





#include "../codecs/rt286.h"

#include "../../codecs/rt286.h"





static struct snd_soc_jack broadwell_headset;

static struct snd_soc_jack broadwell_headset;

/* Headset jack detection DAPM pins */

/* Headset jack detection DAPM pins */

sound/soc/intel/byt-max98090.c→sound/soc/intel/boards/byt-max98090.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <sound/pcm_params.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include <sound/jack.h>

#include "../codecs/max98090.h"

#include "../../codecs/max98090.h"





struct byt_max98090_private {

struct byt_max98090_private {

	struct snd_soc_jack jack;

	struct snd_soc_jack jack;

sound/soc/intel/byt-rt5640.c→sound/soc/intel/boards/byt-rt5640.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <sound/pcm_params.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include <sound/jack.h>

#include "../codecs/rt5640.h"

#include "../../codecs/rt5640.h"





#include "sst-dsp.h"

#include "../common/sst-dsp.h"





static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = {

static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_HP("Headphone", NULL),