merge n25q spi support from master to dev