samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

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

Selaa lähdekoodia
This commit is contained in:
Linux Build Service Account
2018-08-11 02:52:54 -07:00
committed by Gerrit - the friendly Code Review server
vanhempi b94000b1af 59c7a1de15
commit 477a5f2452
4 muutettua tiedostoa jossa 16 lisäystä ja 12 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

11
asoc/codecs/bolero/rx-macro.c
Näytä tiedosto

@@ -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,

3
asoc/codecs/bolero/tx-macro.c
Näytä tiedosto

@@ -80,7 +80,8 @@ struct tx_macro_swr_ctrl_platform_data {
};
enum {
TX_MACRO_AIF1_CAP = 0,
TX_MACRO_AIF_INVALID = 0,
TX_MACRO_AIF1_CAP,
TX_MACRO_AIF2_CAP,
TX_MACRO_MAX_DAIS
};

3
asoc/codecs/bolero/va-macro.c
Näytä tiedosto

@@ -53,7 +53,8 @@ module_param(va_tx_unmute_delay, int, 0664);
MODULE_PARM_DESC(va_tx_unmute_delay, "delay to unmute the tx path");
enum {
VA_MACRO_AIF1_CAP = 0,
VA_MACRO_AIF_INVALID = 0,
VA_MACRO_AIF1_CAP,
VA_MACRO_AIF2_CAP,
VA_MACRO_MAX_DAIS,
};

11
asoc/codecs/bolero/wsa-macro.c
Näytä tiedosto

@@ -142,7 +142,8 @@ struct wsa_macro_swr_ctrl_platform_data {
};
enum {
WSA_MACRO_AIF1_PB = 0,
WSA_MACRO_AIF_INVALID = 0,
WSA_MACRO_AIF1_PB,
WSA_MACRO_AIF_MIX1_PB,
WSA_MACRO_AIF_VI,
WSA_MACRO_AIF_ECHO,
@@ -1606,14 +1607,14 @@ static int wsa_macro_rx_mux_put(struct snd_kcontrol *kcontrol,
switch (rx_port_value) {
case 0:
clear_bit(bit_input,
&wsa_priv->active_ch_mask[aif_rst - 1]);
wsa_priv->active_ch_cnt[aif_rst - 1]--;
&wsa_priv->active_ch_mask[aif_rst]);
wsa_priv->active_ch_cnt[aif_rst]--;
break;
case 1:
case 2:
set_bit(bit_input,
&wsa_priv->active_ch_mask[rx_port_value - 1]);
wsa_priv->active_ch_cnt[rx_port_value - 1]++;
&wsa_priv->active_ch_mask[rx_port_value]);
wsa_priv->active_ch_cnt[rx_port_value]++;
break;
default:
dev_err(wsa_dev,