Merge "ipq806x: spi: Enable 4K sector size support"