Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Merge up fixes
Some of the fixes for the Intel bards overlap with development work that
removed old boards.
+26
-10
+2
sound/soc/amd/acp/acp-sof-mach.c
+2
sound/soc/amd/acp/acp-sof-mach.c
+1
sound/soc/au1x/db1200.c
+1
sound/soc/au1x/db1200.c
+9
sound/soc/codecs/cs-amp-lib-test.c
+9
sound/soc/codecs/cs-amp-lib-test.c
···
38
38
{
39
39
struct cs_amp_lib_test_priv *priv = test->priv;
40
40
unsigned int blob_size;
41
+
int i;
41
42
42
43
blob_size = offsetof(struct cirrus_amp_efi_data, data) +
43
44
sizeof(struct cirrus_amp_cal_data) * num_amps;
···
50
49
priv->cal_blob->count = num_amps;
51
50
52
51
get_random_bytes(priv->cal_blob->data, sizeof(struct cirrus_amp_cal_data) * num_amps);
52
+
53
+
/* Ensure all timestamps are non-zero to mark the entry valid. */
54
+
for (i = 0; i < num_amps; i++)
55
+
priv->cal_blob->data[i].calTime[0] |= 1;
56
+
57
+
/* Ensure that all UIDs are non-zero and unique. */
58
+
for (i = 0; i < num_amps; i++)
59
+
*(u8 *)&priv->cal_blob->data[i].calTarget[0] = i + 1;
53
60
}
54
61
55
62
static u64 cs_amp_lib_test_get_target_uid(struct kunit *test)
+6
-1
sound/soc/codecs/cs-amp-lib.c
+6
-1
sound/soc/codecs/cs-amp-lib.c
···
182
182
for (i = 0; i < efi_data->count; ++i) {
183
183
u64 cal_target = cs_amp_cal_target_u64(&efi_data->data[i]);
184
184
185
+
/* Skip empty entries */
186
+
if (!efi_data->data[i].calTime[0] && !efi_data->data[i].calTime[1])
187
+
continue;
188
+
185
189
/* Skip entries with unpopulated silicon ID */
186
190
if (cal_target == 0)
187
191
continue;
···
197
193
}
198
194
}
199
195
200
-
if (!cal && (amp_index >= 0) && (amp_index < efi_data->count)) {
196
+
if (!cal && (amp_index >= 0) && (amp_index < efi_data->count) &&
197
+
(efi_data->data[amp_index].calTime[0] || efi_data->data[amp_index].calTime[1])) {
201
198
u64 cal_target = cs_amp_cal_target_u64(&efi_data->data[amp_index]);
202
199
203
200
/*
+1
-1
sound/soc/intel/boards/bytcht_cx2072x.c
+1
-1
sound/soc/intel/boards/bytcht_cx2072x.c
···
241
241
242
242
/* fix index of codec dai */
243
243
for (i = 0; i < ARRAY_SIZE(byt_cht_cx2072x_dais); i++) {
244
-
if (byt_cht_cx2072x_dais[i].codecs->name &&
244
+
if (byt_cht_cx2072x_dais[i].num_codecs &&
245
245
!strcmp(byt_cht_cx2072x_dais[i].codecs->name,
246
246
"i2c-14F10720:00")) {
247
247
dai_index = i;
+1
-1
sound/soc/intel/boards/bytcht_da7213.c
+1
-1
sound/soc/intel/boards/bytcht_da7213.c
+1
-1
sound/soc/intel/boards/bytcht_es8316.c
+1
-1
sound/soc/intel/boards/bytcht_es8316.c
···
546
546
547
547
/* fix index of codec dai */
548
548
for (i = 0; i < ARRAY_SIZE(byt_cht_es8316_dais); i++) {
549
-
if (byt_cht_es8316_dais[i].codecs->name &&
549
+
if (byt_cht_es8316_dais[i].num_codecs &&
550
550
!strcmp(byt_cht_es8316_dais[i].codecs->name,
551
551
"i2c-ESSX8316:00")) {
552
552
dai_index = i;
+1
-1
sound/soc/intel/boards/bytcr_rt5640.c
+1
-1
sound/soc/intel/boards/bytcr_rt5640.c
···
1677
1677
1678
1678
/* fix index of codec dai */
1679
1679
for (i = 0; i < ARRAY_SIZE(byt_rt5640_dais); i++) {
1680
-
if (byt_rt5640_dais[i].codecs->name &&
1680
+
if (byt_rt5640_dais[i].num_codecs &&
1681
1681
!strcmp(byt_rt5640_dais[i].codecs->name,
1682
1682
"i2c-10EC5640:00")) {
1683
1683
dai_index = i;
+1
-1
sound/soc/intel/boards/bytcr_rt5651.c
+1
-1
sound/soc/intel/boards/bytcr_rt5651.c
+1
-1
sound/soc/intel/boards/bytcr_wm5102.c
+1
-1
sound/soc/intel/boards/bytcr_wm5102.c
+1
-1
sound/soc/intel/boards/cht_bsw_rt5645.c
+1
-1
sound/soc/intel/boards/cht_bsw_rt5645.c
+1
-1
sound/soc/intel/boards/cht_bsw_rt5672.c
+1
-1
sound/soc/intel/boards/cht_bsw_rt5672.c
-1
sound/soc/intel/common/soc-acpi-intel-cht-match.c
-1
sound/soc/intel/common/soc-acpi-intel-cht-match.c