Merge remote-tracking branch 'spi/topic/davinci' into spi-next