diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2016-08-12 16:27:49 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-08-15 15:14:57 +0100 |
| commit | a3f10de1843ab6a37d34d1601cc520498c5d3bc9 (patch) | |
| tree | 60696c0c523e03816e50b44c7871045804da1730 /sound/soc/intel/atom/sst-atom-controls.c | |
| parent | ASoC: Intel: Atom: add definitions for modem/SSP0 interface (diff) | |
| download | linux-dev-a3f10de1843ab6a37d34d1601cc520498c5d3bc9.tar.xz linux-dev-a3f10de1843ab6a37d34d1601cc520498c5d3bc9.zip | |
ASoC: Intel: atom: enable configuration of SSP0
Existing code used SSP2, make selection of SSP id
dependent on port name. This is required when the
machine driver uses non-default settings
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/atom/sst-atom-controls.c')
| -rw-r--r-- | sound/soc/intel/atom/sst-atom-controls.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index 28eea127ec33..0838478c4c3f 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -935,17 +935,26 @@ void sst_fill_ssp_defaults(struct snd_soc_dai *dai) int send_ssp_cmd(struct snd_soc_dai *dai, const char *id, bool enable) { struct sst_data *drv = snd_soc_dai_get_drvdata(dai); - const struct sst_ssp_config *config; + int ssp_id; dev_info(dai->dev, "Enter: enable=%d port_name=%s\n", enable, id); + if (strcmp(id, "ssp0-port") == 0) + ssp_id = SSP_MODEM; + else if (strcmp(id, "ssp2-port") == 0) + ssp_id = SSP_CODEC; + else { + dev_dbg(dai->dev, "port %s is not supported\n", id); + return -1; + } + SST_FILL_DEFAULT_DESTINATION(drv->ssp_cmd.header.dst); drv->ssp_cmd.header.command_id = SBA_HW_SET_SSP; drv->ssp_cmd.header.length = sizeof(struct sst_cmd_sba_hw_set_ssp) - sizeof(struct sst_dsp_header); - config = &sst_ssp_configs; - dev_dbg(dai->dev, "ssp_id: %u\n", config->ssp_id); + drv->ssp_cmd.selection = ssp_id; + dev_dbg(dai->dev, "ssp_id: %u\n", ssp_id); if (enable) drv->ssp_cmd.switch_state = SST_SWITCH_ON; |