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: axi-spi-engine: use devm_spi_alloc_host()"

Browse Source 
This reverts commit 657f211713 which is
commit e12cd96e8e93044646fdf4b2c9a1de62cfa01e7c 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: I824a44e8263704363b2594f588f73c3e174c46f7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-22 10:01:33 +00:00
parent 3a5b2c1e21
commit 948d41cbb2
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,7 +473,7 @@ static int spi_engine_probe(struct platform_device *pdev)
if (irq <= 0) if (irq <= 0)
return -ENXIO; return -ENXIO;
host = devm_spi_alloc_host(&pdev->dev, sizeof(*spi_engine)); host = spi_alloc_host(&pdev->dev, sizeof(*spi_engine));
if (!host) if (!host)
return -ENOMEM; return -ENOMEM;
@@ -482,16 +482,22 @@ 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_enabled(&pdev->dev, "s_axi_aclk");
if (IS_ERR(spi_engine->clk)) if (IS_ERR(spi_engine->clk)) {
return PTR_ERR(spi_engine->clk); ret = PTR_ERR(spi_engine->clk);
goto err_put_host;
}
spi_engine->ref_clk = devm_clk_get_enabled(&pdev->dev, "spi_clk"); spi_engine->ref_clk = devm_clk_get_enabled(&pdev->dev, "spi_clk");
if (IS_ERR(spi_engine->ref_clk)) if (IS_ERR(spi_engine->ref_clk)) {
return PTR_ERR(spi_engine->ref_clk); ret = PTR_ERR(spi_engine->ref_clk);
goto err_put_host;
}
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)) {
return PTR_ERR(spi_engine->base); ret = PTR_ERR(spi_engine->base);
goto err_put_host;
}
version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION); version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
if (SPI_ENGINE_VERSION_MAJOR(version) != 1) { if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {
@@ -499,7 +505,8 @@ static int spi_engine_probe(struct platform_device *pdev)
SPI_ENGINE_VERSION_MAJOR(version), SPI_ENGINE_VERSION_MAJOR(version),
SPI_ENGINE_VERSION_MINOR(version), SPI_ENGINE_VERSION_MINOR(version),
SPI_ENGINE_VERSION_PATCH(version)); SPI_ENGINE_VERSION_PATCH(version));
return -ENODEV; ret = -ENODEV;
goto err_put_host;
} }
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET); writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);
@@ -508,7 +515,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)
return ret; goto err_put_host;
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;
@@ -526,12 +533,14 @@ 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_put_host:
spi_controller_put(host);
return ret; return ret;
} }
static void spi_engine_remove(struct platform_device *pdev) static void spi_engine_remove(struct platform_device *pdev)
{ {
struct spi_controller *host = platform_get_drvdata(pdev); struct spi_controller *host = spi_controller_get(platform_get_drvdata(pdev));
struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine *spi_engine = spi_controller_get_devdata(host);
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
@@ -539,6 +548,8 @@ static void spi_engine_remove(struct platform_device *pdev)
free_irq(irq, host); free_irq(irq, host);
spi_controller_put(host);
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);