spi: mediatek: single device does not require cs_gpios (98c8dccf) · Commits · 戴 / test

When only one device is present, it is not necessary to specify cs_gpios, as the CS line can be controlled by the hardware module. Without this patch, older device tree bindings used before "spi: mediatek: mt8173 spi multiple devices support" would cause a panic on boot. This fixes the crash, and re-introduces backward compatibility. Signed-off-by:

Nicolas Boichat <drinkcat@chromium.org> Acked-by:

Leilk Liu <leilk.liu@mediatek.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/spi/spi-mt65xx.c

+18 −8

Original line number	Diff line number	Diff line
		@@ -410,7 +410,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;
		@@ -632,8 +632,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,
		@@ -642,6 +651,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
		}
		}
		}
		}

		return 0;

Admin message