diff options
| -rw-r--r-- | sound/soc/intel/sst-mfld-dsp.h | 4 | ||||
| -rw-r--r-- | sound/soc/intel/sst-mfld-platform-compress.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/sst-mfld-platform-pcm.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/intel/sst-mfld-dsp.h b/sound/soc/intel/sst-mfld-dsp.h index a74477a12009..8d482d76475a 100644 --- a/sound/soc/intel/sst-mfld-dsp.h +++ b/sound/soc/intel/sst-mfld-dsp.h | |||
| @@ -36,7 +36,6 @@ enum stream_type { | |||
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | struct snd_pcm_params { | 38 | struct snd_pcm_params { |
| 39 | u16 codec; /* codec type */ | ||
| 40 | u8 num_chan; /* 1=Mono, 2=Stereo */ | 39 | u8 num_chan; /* 1=Mono, 2=Stereo */ |
| 41 | u8 pcm_wd_sz; /* 16/24 - bit*/ | 40 | u8 pcm_wd_sz; /* 16/24 - bit*/ |
| 42 | u32 reserved; /* Bitrate in bits per second */ | 41 | u32 reserved; /* Bitrate in bits per second */ |
| @@ -49,7 +48,6 @@ struct snd_pcm_params { | |||
| 49 | 48 | ||
| 50 | /* MP3 Music Parameters Message */ | 49 | /* MP3 Music Parameters Message */ |
| 51 | struct snd_mp3_params { | 50 | struct snd_mp3_params { |
| 52 | u16 codec; | ||
| 53 | u8 num_chan; /* 1=Mono, 2=Stereo */ | 51 | u8 num_chan; /* 1=Mono, 2=Stereo */ |
| 54 | u8 pcm_wd_sz; /* 16/24 - bit*/ | 52 | u8 pcm_wd_sz; /* 16/24 - bit*/ |
| 55 | u8 crc_check; /* crc_check - disable (0) or enable (1) */ | 53 | u8 crc_check; /* crc_check - disable (0) or enable (1) */ |
| @@ -63,7 +61,6 @@ struct snd_mp3_params { | |||
| 63 | 61 | ||
| 64 | /* AAC Music Parameters Message */ | 62 | /* AAC Music Parameters Message */ |
| 65 | struct snd_aac_params { | 63 | struct snd_aac_params { |
| 66 | u16 codec; | ||
| 67 | u8 num_chan; /* 1=Mono, 2=Stereo*/ | 64 | u8 num_chan; /* 1=Mono, 2=Stereo*/ |
| 68 | u8 pcm_wd_sz; /* 16/24 - bit*/ | 65 | u8 pcm_wd_sz; /* 16/24 - bit*/ |
| 69 | u8 bdownsample; /*SBR downsampling 0 - disable 1 -enabled AAC+ only */ | 66 | u8 bdownsample; /*SBR downsampling 0 - disable 1 -enabled AAC+ only */ |
| @@ -77,7 +74,6 @@ struct snd_aac_params { | |||
| 77 | 74 | ||
| 78 | /* WMA Music Parameters Message */ | 75 | /* WMA Music Parameters Message */ |
| 79 | struct snd_wma_params { | 76 | struct snd_wma_params { |
| 80 | u16 codec; | ||
| 81 | u8 num_chan; /* 1=Mono, 2=Stereo */ | 77 | u8 num_chan; /* 1=Mono, 2=Stereo */ |
| 82 | u8 pcm_wd_sz; /* 16/24 - bit*/ | 78 | u8 pcm_wd_sz; /* 16/24 - bit*/ |
| 83 | u32 brate; /* Use the hard coded value. */ | 79 | u32 brate; /* Use the hard coded value. */ |
diff --git a/sound/soc/intel/sst-mfld-platform-compress.c b/sound/soc/intel/sst-mfld-platform-compress.c index 5c3e23492fe5..02abd19fce1d 100644 --- a/sound/soc/intel/sst-mfld-platform-compress.c +++ b/sound/soc/intel/sst-mfld-platform-compress.c | |||
| @@ -112,7 +112,6 @@ static int sst_platform_compr_set_params(struct snd_compr_stream *cstream, | |||
| 112 | switch (params->codec.id) { | 112 | switch (params->codec.id) { |
| 113 | case SND_AUDIOCODEC_MP3: { | 113 | case SND_AUDIOCODEC_MP3: { |
| 114 | str_params.codec = SST_CODEC_TYPE_MP3; | 114 | str_params.codec = SST_CODEC_TYPE_MP3; |
| 115 | str_params.sparams.uc.mp3_params.codec = SST_CODEC_TYPE_MP3; | ||
| 116 | str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in; | 115 | str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in; |
| 117 | str_params.sparams.uc.mp3_params.pcm_wd_sz = 16; | 116 | str_params.sparams.uc.mp3_params.pcm_wd_sz = 16; |
| 118 | break; | 117 | break; |
| @@ -120,7 +119,6 @@ static int sst_platform_compr_set_params(struct snd_compr_stream *cstream, | |||
| 120 | 119 | ||
| 121 | case SND_AUDIOCODEC_AAC: { | 120 | case SND_AUDIOCODEC_AAC: { |
| 122 | str_params.codec = SST_CODEC_TYPE_AAC; | 121 | str_params.codec = SST_CODEC_TYPE_AAC; |
| 123 | str_params.sparams.uc.aac_params.codec = SST_CODEC_TYPE_AAC; | ||
| 124 | str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in; | 122 | str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in; |
| 125 | str_params.sparams.uc.aac_params.pcm_wd_sz = 16; | 123 | str_params.sparams.uc.aac_params.pcm_wd_sz = 16; |
| 126 | if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS) | 124 | if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS) |
diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c index d0bc328538c9..7c790f51d259 100644 --- a/sound/soc/intel/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/sst-mfld-platform-pcm.c | |||
| @@ -147,7 +147,6 @@ static void sst_fill_pcm_params(struct snd_pcm_substream *substream, | |||
| 147 | struct sst_pcm_params *param) | 147 | struct sst_pcm_params *param) |
| 148 | { | 148 | { |
| 149 | 149 | ||
| 150 | param->codec = SST_CODEC_TYPE_PCM; | ||
| 151 | param->num_chan = (u8) substream->runtime->channels; | 150 | param->num_chan = (u8) substream->runtime->channels; |
| 152 | param->pcm_wd_sz = substream->runtime->sample_bits; | 151 | param->pcm_wd_sz = substream->runtime->sample_bits; |
| 153 | param->reserved = 0; | 152 | param->reserved = 0; |
