Merge "ipq6018: choose spi nand bus number and cs number from dts"