diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-10-16 15:29:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 12:20:33 +0100 |
| commit | f07e51c51e44a6e4e6d003f3bccbbf8a1b2cda0d (patch) | |
| tree | f7aa4bd37765b270f7a6bcb3600d23dc1547387d /sound/soc/intel | |
| parent | 5914ccf47bb0954210d64a92396632442c4f2a80 (diff) | |
| download | blackbird-obmc-linux-f07e51c51e44a6e4e6d003f3bccbbf8a1b2cda0d.tar.gz blackbird-obmc-linux-f07e51c51e44a6e4e6d003f3bccbbf8a1b2cda0d.zip | |
ASoC: Intel: Add TDM support to HSW/BDW SSP port
Add TDM support to SSP port via DSP IPC SetDeviceFormat message.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.c | 4 | ||||
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index b6291516dbbf..92d625ab6415 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -1630,6 +1630,10 @@ int sst_hsw_device_set_config(struct sst_hsw *hsw, config.clock_frequency = mclk; config.mode = mode; config.clock_divider = clock_divider; + if (mode == SST_HSW_DEVICE_TDM_CLOCK_MASTER) + config.channels = 4; + else + config.channels = 2; trace_hsw_device_config_req(&config); diff --git a/sound/soc/intel/sst-haswell-ipc.h b/sound/soc/intel/sst-haswell-ipc.h index 2ac194a6d04b..063dd6b669bf 100644 --- a/sound/soc/intel/sst-haswell-ipc.h +++ b/sound/soc/intel/sst-haswell-ipc.h @@ -84,6 +84,7 @@ enum sst_hsw_device_mclk { enum sst_hsw_device_mode { SST_HSW_DEVICE_CLOCK_SLAVE = 0, SST_HSW_DEVICE_CLOCK_MASTER = 1, + SST_HSW_DEVICE_TDM_CLOCK_MASTER = 2, }; /* DX Power State */ @@ -295,7 +296,8 @@ struct sst_hsw_ipc_device_config_req { u32 clock_frequency; u32 mode; u16 clock_divider; - u16 reserved; + u8 channels; + u8 reserved; } __attribute__((packed)); /* Audio Data formats */ |
