iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: zynq-qspi: switch to use modern name

Browse Source 
Change legacy name master/slave to modern name host/target or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://msgid.link/r/20231128093031.3707034-24-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2023-11-28 17:30:28 +08:00 committed by Mark Brown
parent 061851a0cc
commit 178ebb0c50
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/spi/spi-zynq-qspi.c
View File

@ -54,10 +54,10 @@
#define ZYNQ_QSPI_CONFIG_MSTREN_MASK BIT(0) /* Master Mode */ #define ZYNQ_QSPI_CONFIG_MSTREN_MASK BIT(0) /* Master Mode */
/* /*
* QSPI Configuration Register - Baud rate and slave select * QSPI Configuration Register - Baud rate and target select
* *
* These are the values used in the calculation of baud rate divisor and * These are the values used in the calculation of baud rate divisor and
* setting the slave select. * setting the target select.
*/ */
#define ZYNQ_QSPI_CONFIG_BAUD_DIV_MAX GENMASK(2, 0) /* Baud rate maximum */ #define ZYNQ_QSPI_CONFIG_BAUD_DIV_MAX GENMASK(2, 0) /* Baud rate maximum */
#define ZYNQ_QSPI_CONFIG_BAUD_DIV_SHIFT 3 /* Baud rate divisor shift */ #define ZYNQ_QSPI_CONFIG_BAUD_DIV_SHIFT 3 /* Baud rate divisor shift */
@ -164,14 +164,14 @@ static inline void zynq_qspi_write(struct zynq_qspi *xqspi, u32 offset,
* *
* The default settings of the QSPI controller's configurable parameters on * The default settings of the QSPI controller's configurable parameters on
* reset are * reset are
* - Master mode * - Host mode
* - Baud rate divisor is set to 2 * - Baud rate divisor is set to 2
* - Tx threshold set to 1l Rx threshold set to 32 * - Tx threshold set to 1l Rx threshold set to 32
* - Flash memory interface mode enabled * - Flash memory interface mode enabled
* - Size of the word to be transferred as 8 bit * - Size of the word to be transferred as 8 bit
* This function performs the following actions * This function performs the following actions
* - Disable and clear all the interrupts * - Disable and clear all the interrupts
* - Enable manual slave select * - Enable manual target select
* - Enable manual start * - Enable manual start
* - Deselect all the chip select lines * - Deselect all the chip select lines
* - Set the size of the word to be transferred as 32 bit * - Set the size of the word to be transferred as 32 bit
@ -289,7 +289,7 @@ static void zynq_qspi_txfifo_op(struct zynq_qspi *xqspi, unsigned int size)
*/ */
static void zynq_qspi_chipselect(struct spi_device *spi, bool assert) static void zynq_qspi_chipselect(struct spi_device *spi, bool assert)
{ {
struct spi_controller *ctlr = spi->master; struct spi_controller *ctlr = spi->controller;
struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr); struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr);
u32 config_reg; u32 config_reg;
@ -377,7 +377,7 @@ static int zynq_qspi_config_op(struct zynq_qspi *xqspi, struct spi_device *spi)
*/ */
static int zynq_qspi_setup_op(struct spi_device *spi) static int zynq_qspi_setup_op(struct spi_device *spi)
{ {
struct spi_controller *ctlr = spi->master; struct spi_controller *ctlr = spi->controller;
struct zynq_qspi *qspi = spi_controller_get_devdata(ctlr); struct zynq_qspi *qspi = spi_controller_get_devdata(ctlr);
if (ctlr->busy) if (ctlr->busy)
@ -525,7 +525,7 @@ static irqreturn_t zynq_qspi_irq(int irq, void *dev_id)
static int zynq_qspi_exec_mem_op(struct spi_mem *mem, static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
const struct spi_mem_op *op) const struct spi_mem_op *op)
{ {
struct zynq_qspi *xqspi = spi_controller_get_devdata(mem->spi->master); struct zynq_qspi *xqspi = spi_controller_get_devdata(mem->spi->controller);
int err = 0, i; int err = 0, i;
u8 *tmpbuf; u8 *tmpbuf;
@ -637,7 +637,7 @@ static int zynq_qspi_probe(struct platform_device *pdev)
struct zynq_qspi *xqspi; struct zynq_qspi *xqspi;
u32 num_cs; u32 num_cs;
ctlr = spi_alloc_master(&pdev->dev, sizeof(*xqspi)); ctlr = spi_alloc_host(&pdev->dev, sizeof(*xqspi));
if (!ctlr) if (!ctlr)
return -ENOMEM; return -ENOMEM;
@ -647,14 +647,14 @@ static int zynq_qspi_probe(struct platform_device *pdev)
xqspi->regs = devm_platform_ioremap_resource(pdev, 0); xqspi->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(xqspi->regs)) { if (IS_ERR(xqspi->regs)) {
ret = PTR_ERR(xqspi->regs); ret = PTR_ERR(xqspi->regs);
goto remove_master; goto remove_ctlr;
} }
xqspi->pclk = devm_clk_get(&pdev->dev, "pclk"); xqspi->pclk = devm_clk_get(&pdev->dev, "pclk");
if (IS_ERR(xqspi->pclk)) { if (IS_ERR(xqspi->pclk)) {
dev_err(&pdev->dev, "pclk clock not found.\n"); dev_err(&pdev->dev, "pclk clock not found.\n");
ret = PTR_ERR(xqspi->pclk); ret = PTR_ERR(xqspi->pclk);
goto remove_master; goto remove_ctlr;
} }
init_completion(&xqspi->data_completion); init_completion(&xqspi->data_completion);
@ -663,13 +663,13 @@ static int zynq_qspi_probe(struct platform_device *pdev)
if (IS_ERR(xqspi->refclk)) { if (IS_ERR(xqspi->refclk)) {
dev_err(&pdev->dev, "ref_clk clock not found.\n"); dev_err(&pdev->dev, "ref_clk clock not found.\n");
ret = PTR_ERR(xqspi->refclk); ret = PTR_ERR(xqspi->refclk);
goto remove_master; goto remove_ctlr;
} }
ret = clk_prepare_enable(xqspi->pclk); ret = clk_prepare_enable(xqspi->pclk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Unable to enable APB clock.\n"); dev_err(&pdev->dev, "Unable to enable APB clock.\n");
goto remove_master; goto remove_ctlr;
} }
ret = clk_prepare_enable(xqspi->refclk); ret = clk_prepare_enable(xqspi->refclk);
@ -715,7 +715,7 @@ static int zynq_qspi_probe(struct platform_device *pdev)
ret = devm_spi_register_controller(&pdev->dev, ctlr); ret = devm_spi_register_controller(&pdev->dev, ctlr);
if (ret) { if (ret) {
dev_err(&pdev->dev, "spi_register_master failed\n"); dev_err(&pdev->dev, "devm_spi_register_controller failed\n");
goto clk_dis_all; goto clk_dis_all;
} }
@ -725,7 +725,7 @@ clk_dis_all:
clk_disable_unprepare(xqspi->refclk); clk_disable_unprepare(xqspi->refclk);
clk_dis_pclk: clk_dis_pclk:
clk_disable_unprepare(xqspi->pclk); clk_disable_unprepare(xqspi->pclk);
remove_master: remove_ctlr:
spi_controller_put(ctlr); spi_controller_put(ctlr);
return ret; return ret;