stable request: 5.15.y: device-tree SPI ID fixes