shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()"

Browse Source 
This reverts commit aec8b34ec0 which is
commit a08199b309f833fd4221ab5ee2391c791fe26385 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I39e3444570da20fabea97bb89a95cc5c248ebecf
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-22 10:02:26 +00:00
parent b0e59b447d
commit 97cb39500a
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/spi/spi-axi-spi-engine.c
View File

@@ -485,22 +485,30 @@ static int spi_engine_probe(struct platform_device *pdev)
spin_lock_init(&spi_engine->lock); spin_lock_init(&spi_engine->lock);
spi_engine->clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk"); spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
if (IS_ERR(spi_engine->clk)) { if (IS_ERR(spi_engine->clk)) {
ret = PTR_ERR(spi_engine->clk); ret = PTR_ERR(spi_engine->clk);
goto err_put_host; goto err_put_host;
} }
spi_engine->ref_clk = devm_clk_get_enabled(&pdev->dev, "spi_clk"); spi_engine->ref_clk = devm_clk_get(&pdev->dev, "spi_clk");
if (IS_ERR(spi_engine->ref_clk)) { if (IS_ERR(spi_engine->ref_clk)) {
ret = PTR_ERR(spi_engine->ref_clk); ret = PTR_ERR(spi_engine->ref_clk);
goto err_put_host; goto err_put_host;
} }
ret = clk_prepare_enable(spi_engine->clk);
if (ret)
goto err_put_host;
ret = clk_prepare_enable(spi_engine->ref_clk);
if (ret)
goto err_clk_disable;
spi_engine->base = devm_platform_ioremap_resource(pdev, 0); spi_engine->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(spi_engine->base)) { if (IS_ERR(spi_engine->base)) {
ret = PTR_ERR(spi_engine->base); ret = PTR_ERR(spi_engine->base);
goto err_put_host; goto err_ref_clk_disable;
} }
version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION); version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
@@ -510,7 +518,7 @@ static int spi_engine_probe(struct platform_device *pdev)
SPI_ENGINE_VERSION_MINOR(version), SPI_ENGINE_VERSION_MINOR(version),
SPI_ENGINE_VERSION_PATCH(version)); SPI_ENGINE_VERSION_PATCH(version));
ret = -ENODEV; ret = -ENODEV;
goto err_put_host; goto err_ref_clk_disable;
} }
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET); writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);
@@ -519,7 +527,7 @@ static int spi_engine_probe(struct platform_device *pdev)
ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host); ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host);
if (ret) if (ret)
goto err_put_host; goto err_ref_clk_disable;
host->dev.of_node = pdev->dev.of_node; host->dev.of_node = pdev->dev.of_node;
host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
@@ -537,6 +545,10 @@ static int spi_engine_probe(struct platform_device *pdev)
return 0; return 0;
err_free_irq: err_free_irq:
free_irq(irq, host); free_irq(irq, host);
err_ref_clk_disable:
clk_disable_unprepare(spi_engine->ref_clk);
err_clk_disable:
clk_disable_unprepare(spi_engine->clk);
err_put_host: err_put_host:
spi_controller_put(host); spi_controller_put(host);
return ret; return ret;
@@ -557,6 +569,9 @@ static void spi_engine_remove(struct platform_device *pdev)
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING); writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE); writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);
writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET); writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET);
clk_disable_unprepare(spi_engine->ref_clk);
clk_disable_unprepare(spi_engine->clk);
} }
static const struct of_device_id spi_engine_match_table[] = { static const struct of_device_id spi_engine_match_table[] = {