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

Commit 7089baad 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: qdsp6v2: Add SEC_I2S_RX port as EC reference"

parents 3c4e0c21 f9391117

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+8 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int fm_switch_enable; 
static int fm_pcmrx_switch_enable;

static int lsm_mux_slim_port;

static int slim0_rx_aanc_fb_port;

static int msm_route_ec_ref_rx = 3; /* NONE */

static int msm_route_ec_ref_rx = 4; /* NONE */

static uint32_t voc_session_id = ALL_SESSION_VSID;

static int msm_route_ext_ec_ref = AFE_PORT_INVALID;

static bool is_custom_stereo_on;
@@ -1166,6 +1166,10 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
		msm_route_ec_ref_rx = 1;

		ec_ref_port_id = AFE_PORT_ID_PRIMARY_MI2S_RX;

		break;

	case 2:

		msm_route_ec_ref_rx = 2;

		ec_ref_port_id = AFE_PORT_ID_SECONDARY_MI2S_RX;

		break;

	default:

		msm_route_ec_ref_rx = 3; /* NONE */

		ec_ref_port_id = -1;
@@ -1178,10 +1182,10 @@ static int msm_routing_ec_ref_rx_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static const char *const ec_ref_rx[] = { "SLIM_RX", "I2S_RX", "PROXY_RX",

	"NONE" };

static const char *const ec_ref_rx[] = { "SLIM_RX", "I2S_RX", "SEC_I2S_RX",

	"PROXY_RX", "NONE" };

static const struct soc_enum msm_route_ec_ref_rx_enum[] = {

	SOC_ENUM_SINGLE_EXT(4, ec_ref_rx),

	SOC_ENUM_SINGLE_EXT(5, ec_ref_rx),

};



static const struct snd_kcontrol_new ec_ref_rx_mixer_controls[] = {