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: switch to use modern name"

Browse Source 
This reverts commit d8309051f7 which is
commit 9d5920b37a 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: I291f97847d02218c5f88519014a3646f9c5f6060
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-22 10:02:54 +00:00
parent 97cb39500a
commit 31e3fe5faa
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,8 +356,8 @@ static bool spi_engine_read_rx_fifo(struct spi_engine *spi_engine)
static irqreturn_t spi_engine_irq(int irq, void *devid) static irqreturn_t spi_engine_irq(int irq, void *devid)
{ {
struct spi_controller *host = devid; struct spi_master *master = devid;
struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine *spi_engine = spi_master_get_devdata(master);
unsigned int disable_int = 0; unsigned int disable_int = 0;
unsigned int pending; unsigned int pending;
@@ -396,7 +396,7 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
msg->status = 0; msg->status = 0;
msg->actual_length = msg->frame_length; msg->actual_length = msg->frame_length;
spi_engine->msg = NULL; spi_engine->msg = NULL;
spi_finalize_current_message(host); spi_finalize_current_message(master);
disable_int |= SPI_ENGINE_INT_SYNC; disable_int |= SPI_ENGINE_INT_SYNC;
} }
} }
@@ -412,11 +412,11 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int spi_engine_transfer_one_message(struct spi_controller *host, static int spi_engine_transfer_one_message(struct spi_master *master,
struct spi_message *msg) struct spi_message *msg)
{ {
struct spi_engine_program p_dry, *p; struct spi_engine_program p_dry, *p;
struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine *spi_engine = spi_master_get_devdata(master);
unsigned int int_enable = 0; unsigned int int_enable = 0;
unsigned long flags; unsigned long flags;
size_t size; size_t size;
@@ -464,7 +464,7 @@ static int spi_engine_transfer_one_message(struct spi_controller *host,
static int spi_engine_probe(struct platform_device *pdev) static int spi_engine_probe(struct platform_device *pdev)
{ {
struct spi_engine *spi_engine; struct spi_engine *spi_engine;
struct spi_controller *host; struct spi_master *master;
unsigned int version; unsigned int version;
int irq; int irq;
int ret; int ret;
@@ -477,29 +477,29 @@ static int spi_engine_probe(struct platform_device *pdev)
if (!spi_engine) if (!spi_engine)
return -ENOMEM; return -ENOMEM;
host = spi_alloc_host(&pdev->dev, 0); master = spi_alloc_master(&pdev->dev, 0);
if (!host) if (!master)
return -ENOMEM; return -ENOMEM;
spi_controller_set_devdata(host, spi_engine); spi_master_set_devdata(master, spi_engine);
spin_lock_init(&spi_engine->lock); spin_lock_init(&spi_engine->lock);
spi_engine->clk = devm_clk_get(&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_master;
} }
spi_engine->ref_clk = devm_clk_get(&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_master;
} }
ret = clk_prepare_enable(spi_engine->clk); ret = clk_prepare_enable(spi_engine->clk);
if (ret) if (ret)
goto err_put_host; goto err_put_master;
ret = clk_prepare_enable(spi_engine->ref_clk); ret = clk_prepare_enable(spi_engine->ref_clk);
if (ret) if (ret)
@@ -525,46 +525,46 @@ static int spi_engine_probe(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);
ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host); ret = request_irq(irq, spi_engine_irq, 0, pdev->name, master);
if (ret) if (ret)
goto err_ref_clk_disable; goto err_ref_clk_disable;
host->dev.of_node = pdev->dev.of_node; master->dev.of_node = pdev->dev.of_node;
host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
host->bits_per_word_mask = SPI_BPW_MASK(8); master->bits_per_word_mask = SPI_BPW_MASK(8);
host->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2; master->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2;
host->transfer_one_message = spi_engine_transfer_one_message; master->transfer_one_message = spi_engine_transfer_one_message;
host->num_chipselect = 8; master->num_chipselect = 8;
ret = spi_register_controller(host); ret = spi_register_master(master);
if (ret) if (ret)
goto err_free_irq; goto err_free_irq;
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, master);
return 0; return 0;
err_free_irq: err_free_irq:
free_irq(irq, host); free_irq(irq, master);
err_ref_clk_disable: err_ref_clk_disable:
clk_disable_unprepare(spi_engine->ref_clk); clk_disable_unprepare(spi_engine->ref_clk);
err_clk_disable: err_clk_disable:
clk_disable_unprepare(spi_engine->clk); clk_disable_unprepare(spi_engine->clk);
err_put_host: err_put_master:
spi_controller_put(host); spi_master_put(master);
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 = spi_controller_get(platform_get_drvdata(pdev)); struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine *spi_engine = spi_master_get_devdata(master);
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
spi_unregister_controller(host); spi_unregister_master(master);
free_irq(irq, host); free_irq(irq, master);
spi_controller_put(host); spi_master_put(master);
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);