Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 690d9608 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Correct the AFE port mapping"

parents d8151d98 0b6364c9

include/sound/q6afe-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ enum { 
	IDX_SLIMBUS_6_RX = 45,

	IDX_SLIMBUS_6_TX = 46,

	IDX_GLOBAL_CFG,

	IDX_AUDIO_PORT_ID_I2S_RX,

	AFE_MAX_PORTS

};

sound/soc/msm/qdsp6v2/q6audio-v2.c

+5 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ int q6audio_get_port_index(u16 port_id) 
		return IDX_AFE_PORT_ID_TERTIARY_MI2S_RX;

	case AFE_PORT_ID_TERTIARY_MI2S_TX:

		return IDX_AFE_PORT_ID_TERTIARY_MI2S_TX;



	case AUDIO_PORT_ID_I2S_RX:

		return IDX_AUDIO_PORT_ID_I2S_RX;

	default: return -EINVAL;

	}

}
@@ -144,6 +145,8 @@ int q6audio_get_port_id(u16 port_id) 
			     return AFE_PORT_ID_TERTIARY_MI2S_RX;

	case AFE_PORT_ID_TERTIARY_MI2S_TX:

			     return AFE_PORT_ID_TERTIARY_MI2S_TX;

	case AUDIO_PORT_ID_I2S_RX:

			return AUDIO_PORT_ID_I2S_RX;

	default:

		pr_warn("%s: Invalid port_id %d\n", __func__, port_id);

		return -EINVAL;
@@ -193,6 +196,7 @@ int q6audio_is_digital_pcm_interface(u16 port_id) 
	case AFE_PORT_ID_PRIMARY_MI2S_TX:

	case AFE_PORT_ID_SECONDARY_MI2S_RX:

	case AFE_PORT_ID_SECONDARY_MI2S_TX:

	case AUDIO_PORT_ID_I2S_RX:

		break;

	default:

		ret = -EINVAL;