xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'asoc-5.3' into asoc-5.4

Browse Source
This commit is contained in:
Mark Brown
2019-08-20 18:28:43 +01:00
parent d5e120422d bf283a05c0
commit dd28d54c24
18 changed files with 234 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/meson/Kconfig
View File

@@ -87,6 +87,7 @@ config SND_MESON_AXG_PDM
config SND_MESON_G12A_TOHDMITX
tristate "Amlogic G12A To HDMI TX Control Support"
select REGMAP_MMIO
imply SND_SOC_HDMI_CODEC
help
Select Y or M to add support for HDMI audio on the g12a SoC

2
sound/soc/meson/axg-tdm-formatter.c
View File

@@ -325,7 +325,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev)
}
/* Formatter dedicated reset line */
formatter->reset = reset_control_get_optional_exclusive(dev, NULL);
formatter->reset = devm_reset_control_get_optional_exclusive(dev, NULL);
if (IS_ERR(formatter->reset)) {
ret = PTR_ERR(formatter->reset);
if (ret != -EPROBE_DEFER)