From 5dfbf073be081b8028c3cdf8df833a82f0387f54 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Tue, 18 Aug 2020 10:06:52 +0800 Subject: [PATCH] soc: swr-slave: update swr config for SWR DMIC Update soundwire slave config for SWR DMIC QMIC recording. Change-Id: I988c022cbb019bd6718cd7fbed46b1ccbcf97c5d Signed-off-by: Meng Wang --- asoc/lahaina-port-config.h | 2 +- soc/swr-slave-port-config.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asoc/lahaina-port-config.h b/asoc/lahaina-port-config.h index 6a0afd4103d2..8584d9e8ed5a 100644 --- a/asoc/lahaina-port-config.h +++ b/asoc/lahaina-port-config.h @@ -60,7 +60,7 @@ static struct port_params tx_frame_params_shima[SWR_MSTR_PORT_LEN] = { /* 4.8 MHz clock */ static struct port_params tx_frame_params_4p8MHz[SWR_MSTR_PORT_LEN] = { - {3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ + {7, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ {3, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 1, 0x00, 0x00}, /* TX2 */ {3, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */ }; diff --git a/soc/swr-slave-port-config.h b/soc/swr-slave-port-config.h index 3c70d795a10e..6bb5a8c2ea18 100644 --- a/soc/swr-slave-port-config.h +++ b/soc/swr-slave-port-config.h @@ -63,29 +63,29 @@ static struct port_params tx_top_mic_9p6MHz[SWR_MSTR_PORT_LEN] = { {7, 5, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ }; -/* 3 Channel configuration */ +/* 4 Channel configuration */ /* SWR DMIC0 */ static struct port_params tx_bottom_mic_4p8MHz[SWR_MSTR_PORT_LEN] = { {3, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ - {3, 3, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ + {7, 5, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ }; /* SWR DMIC1 */ static struct port_params tx_receiver_mic_4p8MHz[SWR_MSTR_PORT_LEN] = { {3, 3, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ - {3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ + {7, 6, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ }; /* SWR DMIC2 */ static struct port_params tx_back_mic_4p8MHz[SWR_MSTR_PORT_LEN] = { {3, 3, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ - {3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ + {7, 7, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ }; /* SWR DMIC3 */ static struct port_params tx_top_mic_4p8MHz[SWR_MSTR_PORT_LEN] = { {3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */ - {3, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ + {7, 4, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */ }; struct swr_dev_frame_config {