Merge "ASoC: lahaina: Update soundwire frame configuration" (86cd0592) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/lahaina-port-config.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ static struct port_params rx_frame_params_default[SWR_MSTR_PORT_LEN] = {

		/* TX UC1: TX1: 1ch, TX2: 2chs, TX3: 1ch(MBHC) */
		static struct port_params tx_frame_params_default[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, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */
		{7, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX1 */
		{3, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 1, 0x00, 0x00}, /* TX2 */
		{7, 5, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */
		};

		/* TX UC1: TX1: 1ch, TX2: 2chs, TX3: 1ch(MBHC) */
		@@ -58,8 +58,16 @@ static struct port_params tx_frame_params_shima[SWR_MSTR_PORT_LEN] = {
		{7, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */
		};

		/* 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 */
		{3, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 1, 0x00, 0x00}, /* TX2 */
		{3, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */
		};

		static struct swr_mstr_port_map sm_port_map[] = {
		{TX_MACRO, SWR_UC0, tx_frame_params_default},
		{TX_MACRO, SWR_UC1, tx_frame_params_4p8MHz},
		{RX_MACRO, SWR_UC0, rx_frame_params_default},
		{RX_MACRO, SWR_UC1, rx_frame_params_dsd},
		{WSA_MACRO, SWR_UC0, wsa_frame_params_default},