Merge branch 'fix/mediatek' of...

Merge branch 'fix/mediatek' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-mtk

drivers/spi/spi-mt65xx.c

@@ -407,7 +407,7 @@ static int mtk_spi_setup(struct spi_device *spi)
 	if (!spi->controller_data)
 		spi->controller_data = (void *)&mtk_default_chip_info;
 
-	if (mdata->dev_comp->need_pad_sel)
+	if (mdata->dev_comp->need_pad_sel && gpio_is_valid(spi->cs_gpio))
 		gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
 
 	return 0;
@@ -629,8 +629,17 @@ static int mtk_spi_probe(struct platform_device *pdev)
 			goto err_put_master;
 		}
 
+		if (!master->cs_gpios && master->num_chipselect > 1) {
+			dev_err(&pdev->dev,
+				"cs_gpios not specified and num_chipselect > 1\n");
+			ret = -EINVAL;
+			goto err_put_master;
+		}
+
+		if (master->cs_gpios) {
 			for (i = 0; i < master->num_chipselect; i++) {
-			ret = devm_gpio_request(&pdev->dev, master->cs_gpios[i],
+				ret = devm_gpio_request(&pdev->dev,
+							master->cs_gpios[i],
 							dev_name(&pdev->dev));
 				if (ret) {
 					dev_err(&pdev->dev,
@@ -639,6 +648,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
 				}
 			}
 		}
+	}
 
 	return 0;