On Mon 16 Mar 2020 at 09:28, Jerome Brunet <jbrunet@xxxxxxxxxxxx> wrote: > On Mon 16 Mar 2020 at 03:33, Sasha Levin <sashal@xxxxxxxxxx> wrote: > >> From: Jerome Brunet <jbrunet@xxxxxxxxxxxx> >> >> [ Upstream commit 22946f37557e27697aabc8e4f62642bfe4a17fd8 ] >> >> Reset the g12a hdmi codec glue on probe. This ensure a sane startup state. >> >> Signed-off-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx> >> Link: https://lore.kernel.org/r/20200221121146.1498427-1-jbrunet@xxxxxxxxxxxx >> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> >> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > Hi Sasha, > > The tohdmitx reset property is not in the amlogic g12a DT in v5.4. > Backporting this patch on v5.4 would break the hdmi sound, and probably > the related sound card since the reset is not optional. > > Could you please drop this from v5.4 stable ? Hi Sasha, I just received a notification that this patch has been applied to 5.4 stable. As explained above, it will cause a regression. Could you please drop it from v5.4 stable ? Thanks Jerome > It is ok to keep it for v5.5. > > Thanks > Jerome > >> --- >> sound/soc/meson/g12a-tohdmitx.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c >> index 9cfbd343a00c8..8a0db28a6a406 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> >> >> @@ -378,6 +379,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))
