spi: Merge AMD fix