Merge "soc: update port config table to handle sva/voip" (6de6dc28) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/lahaina-port-config.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,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] = {
		{7, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */
		{15, 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 */
		};

+8 −3

Original line number	Diff line number	Diff line
		@@ -80,11 +80,16 @@ static struct port_params tx_top_mic_9p6MHz[SWR_MSTR_PORT_LEN] = {
		{7, 5, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */
		};

		/* 4 Channel configuration */
		/* The 4.8MHZ port config is used in
		* 1. single mic standalone in "high power" mode
		* 2. dual mic standalone in "high power" mode
		* 3. sva standalone single/dual/tri/quad in "low-power" mode
		* 4. sva single/dmic in "low-power" + single mic in "high power" concurrency
		*/
		/* 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 */
		{7, 5, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */
		{15, 4, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */
		};

		/* SWR DMIC1 */
		@@ -102,7 +107,7 @@ static struct port_params tx_back_mic_4p8MHz[SWR_MSTR_PORT_LEN] = {
		/* 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 */
		{7, 4, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */
		{15, 3, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */
		};

		/* 1 Channel configuration */