diff options
| author | Mark Brown <broonie@kernel.org> | 2019-08-20 20:28:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-20 20:28:43 +0300 |
| commit | dd28d54c248fa37794dfa3d23a24ff99a1d3b6ac (patch) | |
| tree | 066b7a24eb08527f47da41ac3fd3621d073a24d6 /sound/soc/meson | |
| parent | d5e120422db8808e1c8b1507900ca393a877c58f (diff) | |
| parent | bf283a05c09b58db83afbb1a8a3c6a684c56c1bb (diff) | |
| download | linux-dd28d54c248fa37794dfa3d23a24ff99a1d3b6ac.tar.xz | |
Merge branch 'asoc-5.3' into asoc-5.4
Diffstat (limited to 'sound/soc/meson')
| -rw-r--r-- | sound/soc/meson/Kconfig | 1 | ||||
| -rw-r--r-- | sound/soc/meson/axg-tdm-formatter.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig index 63b38c123103..2e3676147cea 100644 --- a/sound/soc/meson/Kconfig +++ b/sound/soc/meson/Kconfig @@ -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 diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c index 21c735afab35..358c8c0d861c 100644 --- a/sound/soc/meson/axg-tdm-formatter.c +++ b/sound/soc/meson/axg-tdm-formatter.c @@ -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) |