diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
| commit | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (patch) | |
| tree | dda57eb9683f421e9438effbdaf719adced18e3d /sound/soc/meson | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| parent | 48118a9323ab715358bf63f5172c5c2b8cf5f455 (diff) | |
Merge branch 'asoc-5.3' into asoc-linus
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 2e498201139f..1a0bf9d3836d 100644 --- a/sound/soc/meson/axg-tdm-formatter.c +++ b/sound/soc/meson/axg-tdm-formatter.c @@ -327,7 +327,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) |