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

Commit 3d240d73 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: Atom: add definitions for modem/SSP0 interface 



The Atom DPCM driver only allowed for the SSP2 interface, add
definitions for modem/SSP0.

These definitions might be used to route audio to a codec
connected to SSP0 (instead of a modem in traditional usages),
but there is a restriction to 2ch I2S. SSP2 is capable of
handling up to 4 slot TDM.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a68bc0d4

sound/soc/intel/atom/sst-atom-controls.c

+16 −1
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static const DECLARE_TLV_DB_SCALE(sst_gain_tlv_common, SST_GAIN_MIN_VALUE * 10, 


/* Look up table to convert MIXER SW bit regs to SWM inputs */

static const uint swm_mixer_input_ids[SST_SWM_INPUT_COUNT] = {

	[SST_IP_MODEM]		= SST_SWM_IN_MODEM,

	[SST_IP_CODEC0]		= SST_SWM_IN_CODEC0,

	[SST_IP_CODEC1]		= SST_SWM_IN_CODEC1,

	[SST_IP_LOOP0]		= SST_SWM_IN_SPROT_LOOP,
@@ -674,6 +675,7 @@ static int sst_swm_mixer_event(struct snd_soc_dapm_widget *w, 
/* SBA mixers - 16 inputs */

#define SST_SBA_DECLARE_MIX_CONTROLS(kctl_name)							\

	static const struct snd_kcontrol_new kctl_name[] = {					\

		SOC_DAPM_SINGLE("modem_in Switch", SND_SOC_NOPM, SST_IP_MODEM, 1, 0),		\

		SOC_DAPM_SINGLE("codec_in0 Switch", SND_SOC_NOPM, SST_IP_CODEC0, 1, 0),		\

		SOC_DAPM_SINGLE("codec_in1 Switch", SND_SOC_NOPM, SST_IP_CODEC1, 1, 0),		\

		SOC_DAPM_SINGLE("sprot_loop_in Switch", SND_SOC_NOPM, SST_IP_LOOP0, 1, 0),	\
@@ -684,6 +686,7 @@ static int sst_swm_mixer_event(struct snd_soc_dapm_widget *w, 
	}



#define SST_SBA_MIXER_GRAPH_MAP(mix_name)			\

	{ mix_name, "modem_in Switch",	"modem_in" },		\

	{ mix_name, "codec_in0 Switch",	"codec_in0" },		\

	{ mix_name, "codec_in1 Switch",	"codec_in1" },		\

	{ mix_name, "sprot_loop_in Switch",	"sprot_loop_in" },	\
@@ -713,6 +716,7 @@ SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_media_l2_controls); 
SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_voip_controls);

SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_codec0_controls);

SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_codec1_controls);

SST_SBA_DECLARE_MIX_CONTROLS(sst_mix_modem_controls);



/*

 * sst_handle_vb_timer - Start/Stop the DSP scheduler
@@ -1047,8 +1051,10 @@ static int sst_set_media_loop(struct snd_soc_dapm_widget *w, 
}



static const struct snd_soc_dapm_widget sst_dapm_widgets[] = {

	SST_AIF_IN("modem_in", sst_set_be_modules),

	SST_AIF_IN("codec_in0", sst_set_be_modules),

	SST_AIF_IN("codec_in1", sst_set_be_modules),

	SST_AIF_OUT("modem_out", sst_set_be_modules),

	SST_AIF_OUT("codec_out0", sst_set_be_modules),

	SST_AIF_OUT("codec_out1", sst_set_be_modules),
@@ -1103,6 +1109,9 @@ static const struct snd_soc_dapm_widget sst_dapm_widgets[] = { 
		      sst_mix_codec0_controls, sst_swm_mixer_event),

	SST_SWM_MIXER("codec_out1 mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_CODEC1,

		      sst_mix_codec1_controls, sst_swm_mixer_event),

	SST_SWM_MIXER("modem_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_MODEM,

		      sst_mix_modem_controls, sst_swm_mixer_event),



};



static const struct snd_soc_dapm_route intercon[] = {
@@ -1148,6 +1157,9 @@ static const struct snd_soc_dapm_route intercon[] = { 
	SST_SBA_MIXER_GRAPH_MAP("codec_out0 mix 0"),

	{"codec_out1", NULL, "codec_out1 mix 0"},

	SST_SBA_MIXER_GRAPH_MAP("codec_out1 mix 0"),

	{"modem_out", NULL, "modem_out mix 0"},

	SST_SBA_MIXER_GRAPH_MAP("modem_out mix 0"),





};

static const char * const slot_names[] = {
@@ -1217,6 +1229,9 @@ static const struct snd_kcontrol_new sst_gain_controls[] = { 
	SST_GAIN("media_loop2_out", SST_PATH_INDEX_MEDIA_LOOP2_OUT, SST_TASK_SBA, 0, &sst_gains[13]),

	SST_GAIN("sprot_loop_out", SST_PATH_INDEX_SPROT_LOOP_OUT, SST_TASK_SBA, 0, &sst_gains[14]),

	SST_VOLUME("media0_in", SST_PATH_INDEX_MEDIA0_IN, SST_TASK_MMX, 0, &sst_gains[15]),

	SST_GAIN("modem_in", SST_PATH_INDEX_MODEM_IN, SST_TASK_SBA, 0, &sst_gains[16]),

	SST_GAIN("modem_out", SST_PATH_INDEX_MODEM_OUT, SST_TASK_SBA, 0, &sst_gains[17]),



};



#define SST_GAIN_NUM_CONTROLS 3

sound/soc/intel/atom/sst-atom-controls.h

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ enum { 
/* define a bit for each mixer input */

#define SST_MIX_IP(x)		(x)



#define SST_IP_MODEM		SST_MIX_IP(0)

#define SST_IP_BT		SST_MIX_IP(1)

#define SST_IP_CODEC0		SST_MIX_IP(2)

#define SST_IP_CODEC1		SST_MIX_IP(3)

#define SST_IP_LOOP0		SST_MIX_IP(4)
@@ -63,6 +65,7 @@ enum { 
 * Audio DSP Path Ids. Specified by the audio DSP FW

 */

enum sst_path_index {

	SST_PATH_INDEX_MODEM_OUT                = (0x00 << SST_PATH_ID_SHIFT),

	SST_PATH_INDEX_CODEC_OUT0               = (0x02 << SST_PATH_ID_SHIFT),

	SST_PATH_INDEX_CODEC_OUT1               = (0x03 << SST_PATH_ID_SHIFT),
@@ -80,6 +83,7 @@ enum sst_path_index { 




	/* Start of input paths */

	SST_PATH_INDEX_MODEM_IN                 = (0x80 << SST_PATH_ID_SHIFT),

	SST_PATH_INDEX_CODEC_IN0                = (0x82 << SST_PATH_ID_SHIFT),

	SST_PATH_INDEX_CODEC_IN1                = (0x83 << SST_PATH_ID_SHIFT),
@@ -105,6 +109,7 @@ enum sst_path_index { 
 * path IDs

 */

enum sst_swm_inputs {

	SST_SWM_IN_MODEM	= (SST_PATH_INDEX_MODEM_IN	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_IN_CODEC0	= (SST_PATH_INDEX_CODEC_IN0	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_IN_CODEC1	= (SST_PATH_INDEX_CODEC_IN1	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_IN_SPROT_LOOP	= (SST_PATH_INDEX_SPROT_LOOP_IN	  | SST_DEFAULT_CELL_NBR),
@@ -124,6 +129,7 @@ enum sst_swm_inputs { 
 * path IDs

 */

enum sst_swm_outputs {

	SST_SWM_OUT_MODEM	= (SST_PATH_INDEX_MODEM_OUT	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_OUT_CODEC0	= (SST_PATH_INDEX_CODEC_OUT0	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_OUT_CODEC1	= (SST_PATH_INDEX_CODEC_OUT1	  | SST_DEFAULT_CELL_NBR),

	SST_SWM_OUT_SPROT_LOOP	= (SST_PATH_INDEX_SPROT_LOOP_OUT  | SST_DEFAULT_CELL_NBR),