Merge branch 'spi-4.20' into spi-4.21 for bcm stuff.