Merge existing fixes from spi/for-5.12
authorMark Brown <broonie@kernel.org>
Mon, 1 Mar 2021 14:12:10 +0000 (14:12 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 12:46:50 +0000 (12:46 +0000)

Trivial merge