The previous merge of v5.3-rc7 was struggle enough, now it
gave rise to new errors and now I fix those too.

Fixes: 151a4101 ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>