asoc: bolero: Update AIF dai-id to start with value 1

ASoC core assigns dai id value to num_dais if
AIF dai-id passed is 0. Since we have different macros
passing AIF dai-id as 0, they are replaced in ASoC core.
To handle this, update AIF dai-id in respective macros
to start with value 1.

Change-Id: I222c088289292aa226c90710e56a8c94af5615cd
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
This commit is contained in:
Laxminath Kasam
2018-08-09 16:11:17 +05:30
부모 a771e10ca7
커밋 59c7a1de15
4개의 변경된 파일16개의 추가작업 그리고 12개의 파일을 삭제

파일 보기

@@ -189,7 +189,8 @@ struct rx_swr_ctrl_platform_data {
};
enum {
RX_MACRO_AIF1_PB = 0,
RX_MACRO_AIF_INVALID = 0,
RX_MACRO_AIF1_PB,
RX_MACRO_AIF2_PB,
RX_MACRO_AIF3_PB,
RX_MACRO_AIF4_PB,
@@ -1301,16 +1302,16 @@ static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,
switch (rx_port_value) {
case 0:
clear_bit(widget->shift,
&rx_priv->active_ch_mask[aif_rst - 1]);
rx_priv->active_ch_cnt[aif_rst - 1]--;
&rx_priv->active_ch_mask[aif_rst]);
rx_priv->active_ch_cnt[aif_rst]--;
break;
case 1:
case 2:
case 3:
case 4:
set_bit(widget->shift,
&rx_priv->active_ch_mask[rx_port_value - 1]);
rx_priv->active_ch_cnt[rx_port_value - 1]++;
&rx_priv->active_ch_mask[rx_port_value]);
rx_priv->active_ch_cnt[rx_port_value]++;
break;
default:
dev_err(codec->dev,