Unverified Commit d103729a authored by Rafał Hibner's avatar Rafał Hibner Committed by Mark Brown
Browse files

spi: spi-axi-spi-engine: Access register after clock initialization 



Move register access after clock initialization.
Clock "s_axi_aclk" is needed for register access. Without the clock running
AXI bus hangs and causes kernel freeze.

Signed-off-by: default avatarRafał Hibner <rafal.hibner@secom.com.pl>
Reviewed-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Cc: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20200409155621.12174-1-rafal.hibner@secom.com.pl


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 61249ce0

drivers/spi/spi-axi-spi-engine.c

+16 −16
Original line number Diff line number Diff line
@@ -489,22 +489,6 @@ static int spi_engine_probe(struct platform_device *pdev) 


	spin_lock_init(&spi_engine->lock);



	spi_engine->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(spi_engine->base)) {

		ret = PTR_ERR(spi_engine->base);

		goto err_put_master;

	}



	version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);

	if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {

		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",

			SPI_ENGINE_VERSION_MAJOR(version),

			SPI_ENGINE_VERSION_MINOR(version),

			SPI_ENGINE_VERSION_PATCH(version));

		ret = -ENODEV;

		goto err_put_master;

	}



	spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");

	if (IS_ERR(spi_engine->clk)) {

		ret = PTR_ERR(spi_engine->clk);
@@ -525,6 +509,22 @@ static int spi_engine_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_disable;



	spi_engine->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(spi_engine->base)) {

		ret = PTR_ERR(spi_engine->base);

		goto err_ref_clk_disable;

	}



	version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);

	if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {

		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",

			SPI_ENGINE_VERSION_MAJOR(version),

			SPI_ENGINE_VERSION_MINOR(version),

			SPI_ENGINE_VERSION_PATCH(version));

		ret = -ENODEV;

		goto err_ref_clk_disable;

	}



	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);

	writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);

	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE