diff mbox

ASoC: Intel: Add TDM support to HSW/BDW SSP port

Message ID 1413469757-6200-2-git-send-email-liam.r.girdwood@linux.intel.com (mailing list archive)
State Accepted
Commit f07e51c51e44a6e4e6d003f3bccbbf8a1b2cda0d
Headers show

Commit Message

Liam Girdwood Oct. 16, 2014, 2:29 p.m. UTC 
Add TDM support to SSP port via DSP IPC SetDeviceFormat message.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
 sound/soc/intel/sst-haswell-ipc.c | 4 ++++
 sound/soc/intel/sst-haswell-ipc.h | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Mark Brown Oct. 16, 2014, 2:49 p.m. UTC | #1 
On Thu, Oct 16, 2014 at 03:29:15PM +0100, Liam Girdwood wrote:
> Add TDM support to SSP port via DSP IPC SetDeviceFormat message.

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index b629151..92d625a 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 2ac194a..063dd6b 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 */