Skip to content

Commit 15cb732

Browse files
torvaldstorvalds
committed
Merge tag 'sound-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Here we see slightly more commits than wished, but basically all are small and mostly trivial fixes. The only core change is the workaround for __counted_by() usage in ASoC DAPM code, while the rest are device-specific fixes for Intel Baytrail devices, Cirrus and wcd937x codecs, and HD-audio / USB-audio devices" * tag 'sound-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1 ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3 ALSA: usb-audio: Add quirks for Dell WD19 dock ASoC: codecs: wcd937x: relax the AUX PDM watchdog ASoC: codecs: wcd937x: add missing LO Switch control ASoC: dt-bindings: rockchip,rk3308-codec: add port property ALSA: hda/realtek: Add subwoofer quirk for Infinix ZERO BOOK 13 ASoC: dapm: fix bounds checker error in dapm_widget_list_create ASoC: Intel: sst: Fix used of uninitialized ctx to log an error ASoC: cs42l51: Fix some error handling paths in cs42l51_probe() ASoC: Intel: sst: Support LPE0F28 ACPI HID ALSA: hda/realtek: Limit internal Mic boost on Dell platform ASoC: Intel: bytcr_rt5640: Add DMI quirk for Vexia Edu Atla 10 tablet ASoC: Intel: bytcr_rt5640: Add support for non ACPI instantiated codec ASoC: codecs: rt5640: Always disable IRQs from rt5640_cancel_work()
2 parents 0fc810a + e49370d commit 15cb732

File tree

11 files changed

+179
-31
lines changed

11 files changed

+179
-31
lines changed

‎Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ properties:
4848
- const: mclk_rx
4949
- const: hclk
5050

51+
port:
52+
$ref: audio-graph-port.yaml#
53+
unevaluatedProperties: false
54+
5155
resets:
5256
maxItems: 1
5357

‎sound/hda/intel-dsp-config.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,10 @@ static const struct config_entry acpi_config_table[] = {
721721
#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) || \
722722
IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
723723
/* BayTrail */
724+
{
725+
.flags = FLAG_SST_OR_SOF_BYT,
726+
.acpi_hid = "LPE0F28",
727+
},
724728
{
725729
.flags = FLAG_SST_OR_SOF_BYT,
726730
.acpi_hid = "80860F28",

‎sound/pci/hda/patch_realtek.c‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7521,6 +7521,7 @@ enum {
75217521
ALC286_FIXUP_SONY_MIC_NO_PRESENCE,
75227522
ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
75237523
ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
7524+
ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
75247525
ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
75257526
ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
75267527
ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
@@ -7551,10 +7552,12 @@ enum {
75517552
ALC290_FIXUP_SUBWOOFER_HSJACK,
75527553
ALC269_FIXUP_THINKPAD_ACPI,
75537554
ALC269_FIXUP_DMIC_THINKPAD_ACPI,
7555+
ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13,
75547556
ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO,
75557557
ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
75567558
ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,
75577559
ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
7560+
ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
75587561
ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
75597562
ALC255_FIXUP_HEADSET_MODE,
75607563
ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,
@@ -7996,6 +7999,16 @@ static const struct hda_fixup alc269_fixups[] = {
79967999
.type = HDA_FIXUP_FUNC,
79978000
.v.func = alc269_fixup_pincfg_U7x7_headset_mic,
79988001
},
8002+
[ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13] = {
8003+
.type = HDA_FIXUP_PINS,
8004+
.v.pins = (const struct hda_pintbl[]) {
8005+
{ 0x14, 0x90170151 }, /* use as internal speaker (LFE) */
8006+
{ 0x1b, 0x90170152 }, /* use as internal speaker (back) */
8007+
{ }
8008+
},
8009+
.chained = true,
8010+
.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
8011+
},
79998012
[ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO] = {
80008013
.type = HDA_FIXUP_PINS,
80018014
.v.pins = (const struct hda_pintbl[]) {
@@ -8114,6 +8127,12 @@ static const struct hda_fixup alc269_fixups[] = {
81148127
.chained = true,
81158128
.chain_id = ALC269_FIXUP_HEADSET_MODE
81168129
},
8130+
[ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {
8131+
.type = HDA_FIXUP_FUNC,
8132+
.v.func = alc269_fixup_limit_int_mic_boost,
8133+
.chained = true,
8134+
.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
8135+
},
81178136
[ALC269_FIXUP_DELL2_MIC_NO_PRESENCE] = {
81188137
.type = HDA_FIXUP_PINS,
81198138
.v.pins = (const struct hda_pintbl[]) {
@@ -8394,6 +8413,12 @@ static const struct hda_fixup alc269_fixups[] = {
83948413
.chained = true,
83958414
.chain_id = ALC255_FIXUP_HEADSET_MODE
83968415
},
8416+
[ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {
8417+
.type = HDA_FIXUP_FUNC,
8418+
.v.func = alc269_fixup_limit_int_mic_boost,
8419+
.chained = true,
8420+
.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
8421+
},
83978422
[ALC255_FIXUP_DELL2_MIC_NO_PRESENCE] = {
83988423
.type = HDA_FIXUP_PINS,
83998424
.v.pins = (const struct hda_pintbl[]) {
@@ -10725,6 +10750,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1072510750
SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1072610751
SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1072710752
SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
10753+
SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC),
1072810754
SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1072910755
SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1073010756
SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10982,13 +11008,15 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1098211008
SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),
1098311009
SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),
1098411010
SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),
11011+
SND_PCI_QUIRK(0x1d05, 0x1409, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),
1098511012
SND_PCI_QUIRK(0x1d17, 0x3288, "Haier Boyue G42", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),
1098611013
SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
1098711014
SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
1098811015
SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
1098911016
SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),
1099011017
SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
1099111018
SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
11019+
SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),
1099211020
SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),
1099311021
SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),
1099411022
SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
@@ -11076,6 +11104,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
1107611104
{.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},
1107711105
{.id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, .name = "dell-headset3"},
1107811106
{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, .name = "dell-headset4"},
11107+
{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET, .name = "dell-headset4-quiet"},
1107911108
{.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
1108011109
{.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
1108111110
{.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
@@ -11630,16 +11659,16 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
1163011659
SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
1163111660
{0x19, 0x40000000},
1163211661
{0x1b, 0x40000000}),
11633-
SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
11662+
SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,
1163411663
{0x19, 0x40000000},
1163511664
{0x1b, 0x40000000}),
1163611665
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
1163711666
{0x19, 0x40000000},
1163811667
{0x1a, 0x40000000}),
11639-
SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
11668+
SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
1164011669
{0x19, 0x40000000},
1164111670
{0x1a, 0x40000000}),
11642-
SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
11671+
SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
1164311672
{0x19, 0x40000000},
1164411673
{0x1a, 0x40000000}),
1164511674
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,

‎sound/soc/codecs/cs42l51.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -747,8 +747,10 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap)
747747

748748
cs42l51->reset_gpio = devm_gpiod_get_optional(dev, "reset",
749749
GPIOD_OUT_LOW);
750-
if (IS_ERR(cs42l51->reset_gpio))
751-
return PTR_ERR(cs42l51->reset_gpio);
750+
if (IS_ERR(cs42l51->reset_gpio)) {
751+
ret = PTR_ERR(cs42l51->reset_gpio);
752+
goto error;
753+
}
752754

753755
if (cs42l51->reset_gpio) {
754756
dev_dbg(dev, "Release reset gpio\n");
@@ -780,6 +782,7 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap)
780782
return 0;
781783

782784
error:
785+
gpiod_set_value_cansleep(cs42l51->reset_gpio, 1);
783786
regulator_bulk_disable(ARRAY_SIZE(cs42l51->supplies),
784787
cs42l51->supplies);
785788
return ret;

‎sound/soc/codecs/rt5640.c‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,10 +2419,20 @@ static irqreturn_t rt5640_jd_gpio_irq(int irq, void *data)
24192419
return IRQ_HANDLED;
24202420
}
24212421

2422-
static void rt5640_cancel_work(void *data)
2422+
static void rt5640_disable_irq_and_cancel_work(void *data)
24232423
{
24242424
struct rt5640_priv *rt5640 = data;
24252425

2426+
if (rt5640->jd_gpio_irq_requested) {
2427+
free_irq(rt5640->jd_gpio_irq, rt5640);
2428+
rt5640->jd_gpio_irq_requested = false;
2429+
}
2430+
2431+
if (rt5640->irq_requested) {
2432+
free_irq(rt5640->irq, rt5640);
2433+
rt5640->irq_requested = false;
2434+
}
2435+
24262436
cancel_delayed_work_sync(&rt5640->jack_work);
24272437
cancel_delayed_work_sync(&rt5640->bp_work);
24282438
}
@@ -2463,22 +2473,14 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component)
24632473
if (!rt5640->jack)
24642474
return;
24652475

2466-
if (rt5640->jd_gpio_irq_requested)
2467-
free_irq(rt5640->jd_gpio_irq, rt5640);
2468-
2469-
if (rt5640->irq_requested)
2470-
free_irq(rt5640->irq, rt5640);
2471-
2472-
rt5640_cancel_work(rt5640);
2476+
rt5640_disable_irq_and_cancel_work(rt5640);
24732477

24742478
if (rt5640->jack->status & SND_JACK_MICROPHONE) {
24752479
rt5640_disable_micbias1_ovcd_irq(component);
24762480
rt5640_disable_micbias1_for_ovcd(component);
24772481
snd_soc_jack_report(rt5640->jack, 0, SND_JACK_BTN_0);
24782482
}
24792483

2480-
rt5640->jd_gpio_irq_requested = false;
2481-
rt5640->irq_requested = false;
24822484
rt5640->jd_gpio = NULL;
24832485
rt5640->jack = NULL;
24842486
}
@@ -2798,7 +2800,8 @@ static int rt5640_suspend(struct snd_soc_component *component)
27982800
if (rt5640->jack) {
27992801
/* disable jack interrupts during system suspend */
28002802
disable_irq(rt5640->irq);
2801-
rt5640_cancel_work(rt5640);
2803+
cancel_delayed_work_sync(&rt5640->jack_work);
2804+
cancel_delayed_work_sync(&rt5640->bp_work);
28022805
}
28032806

28042807
snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
@@ -3032,7 +3035,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c)
30323035
INIT_DELAYED_WORK(&rt5640->jack_work, rt5640_jack_work);
30333036

30343037
/* Make sure work is stopped on probe-error / remove */
3035-
ret = devm_add_action_or_reset(&i2c->dev, rt5640_cancel_work, rt5640);
3038+
ret = devm_add_action_or_reset(&i2c->dev, rt5640_disable_irq_and_cancel_work, rt5640);
30363039
if (ret)
30373040
return ret;
30383041

‎sound/soc/codecs/wcd937x.c‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,12 +715,17 @@ static int wcd937x_codec_enable_aux_pa(struct snd_soc_dapm_widget *w,
715715
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
716716
struct wcd937x_priv *wcd937x = snd_soc_component_get_drvdata(component);
717717
int hph_mode = wcd937x->hph_mode;
718+
u8 val;
718719

719720
switch (event) {
720721
case SND_SOC_DAPM_PRE_PMU:
722+
val = WCD937X_DIGITAL_PDM_WD_CTL2_EN |
723+
WCD937X_DIGITAL_PDM_WD_CTL2_TIMEOUT_SEL |
724+
WCD937X_DIGITAL_PDM_WD_CTL2_HOLD_OFF;
721725
snd_soc_component_update_bits(component,
722726
WCD937X_DIGITAL_PDM_WD_CTL2,
723-
BIT(0), BIT(0));
727+
WCD937X_DIGITAL_PDM_WD_CTL2_MASK,
728+
val);
724729
break;
725730
case SND_SOC_DAPM_POST_PMU:
726731
usleep_range(1000, 1010);
@@ -741,7 +746,8 @@ static int wcd937x_codec_enable_aux_pa(struct snd_soc_dapm_widget *w,
741746
hph_mode);
742747
snd_soc_component_update_bits(component,
743748
WCD937X_DIGITAL_PDM_WD_CTL2,
744-
BIT(0), 0x00);
749+
WCD937X_DIGITAL_PDM_WD_CTL2_MASK,
750+
0x00);
745751
break;
746752
}
747753

@@ -2049,6 +2055,8 @@ static const struct snd_kcontrol_new wcd937x_snd_controls[] = {
20492055
wcd937x_get_swr_port, wcd937x_set_swr_port),
20502056
SOC_SINGLE_EXT("HPHR Switch", WCD937X_HPH_R, 0, 1, 0,
20512057
wcd937x_get_swr_port, wcd937x_set_swr_port),
2058+
SOC_SINGLE_EXT("LO Switch", WCD937X_LO, 0, 1, 0,
2059+
wcd937x_get_swr_port, wcd937x_set_swr_port),
20522060

20532061
SOC_SINGLE_EXT("ADC1 Switch", WCD937X_ADC1, 1, 1, 0,
20542062
wcd937x_get_swr_port, wcd937x_set_swr_port),

‎sound/soc/codecs/wcd937x.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@
391391
#define WCD937X_DIGITAL_PDM_WD_CTL0 0x3465
392392
#define WCD937X_DIGITAL_PDM_WD_CTL1 0x3466
393393
#define WCD937X_DIGITAL_PDM_WD_CTL2 0x3467
394+
#define WCD937X_DIGITAL_PDM_WD_CTL2_HOLD_OFF BIT(2)
395+
#define WCD937X_DIGITAL_PDM_WD_CTL2_TIMEOUT_SEL BIT(1)
396+
#define WCD937X_DIGITAL_PDM_WD_CTL2_EN BIT(0)
397+
#define WCD937X_DIGITAL_PDM_WD_CTL2_MASK GENMASK(2, 0)
394398
#define WCD937X_DIGITAL_INTR_MODE 0x346A
395399
#define WCD937X_DIGITAL_INTR_MASK_0 0x346B
396400
#define WCD937X_DIGITAL_INTR_MASK_1 0x346C

‎sound/soc/intel/atom/sst/sst_acpi.c‎

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,28 @@ static const struct sst_res_info bytcr_res_info = {
125125
.acpi_ipc_irq_index = 0
126126
};
127127

128+
/* For "LPE0F28" ACPI device found on some Android factory OS models */
129+
static const struct sst_res_info lpe8086_res_info = {
130+
.shim_offset = 0x140000,
131+
.shim_size = 0x000100,
132+
.shim_phy_addr = SST_BYT_SHIM_PHY_ADDR,
133+
.ssp0_offset = 0xa0000,
134+
.ssp0_size = 0x1000,
135+
.dma0_offset = 0x98000,
136+
.dma0_size = 0x4000,
137+
.dma1_offset = 0x9c000,
138+
.dma1_size = 0x4000,
139+
.iram_offset = 0x0c0000,
140+
.iram_size = 0x14000,
141+
.dram_offset = 0x100000,
142+
.dram_size = 0x28000,
143+
.mbox_offset = 0x144000,
144+
.mbox_size = 0x1000,
145+
.acpi_lpe_res_index = 1,
146+
.acpi_ddr_index = 0,
147+
.acpi_ipc_irq_index = 0
148+
};
149+
128150
static struct sst_platform_info byt_rvp_platform_data = {
129151
.probe_data = &byt_fwparse_info,
130152
.ipc_info = &byt_ipc_info,
@@ -268,10 +290,38 @@ static int sst_acpi_probe(struct platform_device *pdev)
268290
mach->pdata = &chv_platform_data;
269291
pdata = mach->pdata;
270292

271-
ret = kstrtouint(id->id, 16, &dev_id);
272-
if (ret < 0) {
273-
dev_err(dev, "Unique device id conversion error: %d\n", ret);
274-
return ret;
293+
if (!strcmp(id->id, "LPE0F28")) {
294+
struct resource *rsrc;
295+
296+
/* Use regular BYT SST PCI VID:PID */
297+
dev_id = 0x80860F28;
298+
byt_rvp_platform_data.res_info = &lpe8086_res_info;
299+
300+
/*
301+
* The "LPE0F28" ACPI device has separate IO-mem resources for:
302+
* DDR, SHIM, MBOX, IRAM, DRAM, CFG
303+
* None of which covers the entire LPE base address range.
304+
* lpe8086_res_info.acpi_lpe_res_index points to the SHIM.
305+
* Patch this to cover the entire base address range as expected
306+
* by sst_platform_get_resources().
307+
*/
308+
rsrc = platform_get_resource(pdev, IORESOURCE_MEM,
309+
pdata->res_info->acpi_lpe_res_index);
310+
if (!rsrc) {
311+
dev_err(dev, "Invalid SHIM base\n");
312+
return -EIO;
313+
}
314+
rsrc->start -= pdata->res_info->shim_offset;
315+
rsrc->end = rsrc->start + 0x200000 - 1;
316+
} else {
317+
ret = kstrtouint(id->id, 16, &dev_id);
318+
if (ret < 0) {
319+
dev_err(dev, "Unique device id conversion error: %d\n", ret);
320+
return ret;
321+
}
322+
323+
if (soc_intel_is_byt_cr(pdev))
324+
byt_rvp_platform_data.res_info = &bytcr_res_info;
275325
}
276326

277327
dev_dbg(dev, "ACPI device id: %x\n", dev_id);
@@ -280,11 +330,6 @@ static int sst_acpi_probe(struct platform_device *pdev)
280330
if (ret < 0)
281331
return ret;
282332

283-
if (soc_intel_is_byt_cr(pdev)) {
284-
/* override resource info */
285-
byt_rvp_platform_data.res_info = &bytcr_res_info;
286-
}
287-
288333
/* update machine parameters */
289334
mach->mach_params.acpi_ipc_irq_index =
290335
pdata->res_info->acpi_ipc_irq_index;
@@ -344,6 +389,7 @@ static void sst_acpi_remove(struct platform_device *pdev)
344389
}
345390

346391
static const struct acpi_device_id sst_acpi_ids[] = {
392+
{ "LPE0F28", (unsigned long)&snd_soc_acpi_intel_baytrail_machines},
347393
{ "80860F28", (unsigned long)&snd_soc_acpi_intel_baytrail_machines},
348394
{ "808622A8", (unsigned long)&snd_soc_acpi_intel_cherrytrail_machines},
349395
{ },

0 commit comments

Comments
 (0)