Merge existing fixes from spi/for-5.13
authorMark Brown <broonie@kernel.org>
Mon, 10 May 2021 12:01:03 +0000 (13:01 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 10 May 2021 12:01:03 +0000 (13:01 +0100)

Trivial merge