summaryrefslogtreecommitdiff
path: root/sound/soc/meson
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-02-25 01:26:06 +0300
committerMark Brown <broonie@kernel.org>2020-02-25 01:26:06 +0300
commit6c8beff74c6aafa60cb69b44139de58b74a775e7 (patch)
treebeeb7ed4968bb1426a38fbc77e3d71ecd4306fbd /sound/soc/meson
parent6bff73c6115d088fee4d09aff65e145b990382eb (diff)
parent8308a09e87d2cb51adb186dc7d5a5c1913fb0758 (diff)
downloadlinux-6c8beff74c6aafa60cb69b44139de58b74a775e7.tar.xz
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/meson')
-rw-r--r--sound/soc/meson/g12a-tohdmitx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c
index f8853f2fba08..9b2b59536ced 100644
--- a/sound/soc/meson/g12a-tohdmitx.c
+++ b/sound/soc/meson/g12a-tohdmitx.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <sound/pcm_params.h>
#include <linux/regmap.h>
+#include <linux/reset.h>
#include <sound/soc.h>
#include <sound/soc-dai.h>
@@ -245,6 +246,11 @@ static int g12a_tohdmitx_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
void __iomem *regs;
struct regmap *map;
+ int ret;
+
+ ret = device_reset(dev);
+ if (ret)
+ return ret;
regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(regs))