tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
+14
-10
+5
-1
sound/soc/intel/boards/cht_bsw_rt5645.c
+5
-1
sound/soc/intel/boards/cht_bsw_rt5645.c
···
367
367
}
368
368
card->dev = &pdev->dev;
369
369
sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id);
370
+
370
371
/* set correct codec name */
371
-
strcpy((char *)card->dai_link[2].codec_name, codec_name);
372
+
for (i = 0; i < ARRAY_SIZE(cht_dailink); i++)
373
+
if (!strcmp(card->dai_link[i].codec_name, "i2c-10EC5645:00"))
374
+
card->dai_link[i].codec_name = kstrdup(codec_name, GFP_KERNEL);
375
+
372
376
snd_soc_card_set_drvdata(card, drv);
373
377
ret_val = devm_snd_soc_register_card(&pdev->dev, card);
374
378
if (ret_val) {
+8
-8
sound/soc/intel/boards/mfld_machine.c
+8
-8
sound/soc/intel/boards/mfld_machine.c
···
94
94
static int headset_get_switch(struct snd_kcontrol *kcontrol,
95
95
struct snd_ctl_elem_value *ucontrol)
96
96
{
97
-
ucontrol->value.integer.value[0] = hs_switch;
97
+
ucontrol->value.enumerated.item[0] = hs_switch;
98
98
return 0;
99
99
}
100
100
···
104
104
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
105
105
struct snd_soc_dapm_context *dapm = &card->dapm;
106
106
107
-
if (ucontrol->value.integer.value[0] == hs_switch)
107
+
if (ucontrol->value.enumerated.item[0] == hs_switch)
108
108
return 0;
109
109
110
110
snd_soc_dapm_mutex_lock(dapm);
111
111
112
-
if (ucontrol->value.integer.value[0]) {
112
+
if (ucontrol->value.enumerated.item[0]) {
113
113
pr_debug("hs_set HS path\n");
114
114
snd_soc_dapm_enable_pin_unlocked(dapm, "Headphones");
115
115
snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT");
···
123
123
124
124
snd_soc_dapm_mutex_unlock(dapm);
125
125
126
-
hs_switch = ucontrol->value.integer.value[0];
126
+
hs_switch = ucontrol->value.enumerated.item[0];
127
127
128
128
return 0;
129
129
}
···
148
148
static int lo_get_switch(struct snd_kcontrol *kcontrol,
149
149
struct snd_ctl_elem_value *ucontrol)
150
150
{
151
-
ucontrol->value.integer.value[0] = lo_dac;
151
+
ucontrol->value.enumerated.item[0] = lo_dac;
152
152
return 0;
153
153
}
154
154
···
158
158
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
159
159
struct snd_soc_dapm_context *dapm = &card->dapm;
160
160
161
-
if (ucontrol->value.integer.value[0] == lo_dac)
161
+
if (ucontrol->value.enumerated.item[0] == lo_dac)
162
162
return 0;
163
163
164
164
snd_soc_dapm_mutex_lock(dapm);
···
168
168
*/
169
169
lo_enable_out_pins(dapm);
170
170
171
-
switch (ucontrol->value.integer.value[0]) {
171
+
switch (ucontrol->value.enumerated.item[0]) {
172
172
case 0:
173
173
pr_debug("set vibra path\n");
174
174
snd_soc_dapm_disable_pin_unlocked(dapm, "VIB1OUT");
···
202
202
203
203
snd_soc_dapm_mutex_unlock(dapm);
204
204
205
-
lo_dac = ucontrol->value.integer.value[0];
205
+
lo_dac = ucontrol->value.enumerated.item[0];
206
206
return 0;
207
207
}
208
208