Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: s3c64xx: 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://lore.kernel.org/r/20230818093154.1183529-17-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2023-08-18 17:31:47 +08:00 committed by Mark Brown
parent 6536da62e4
commit f4bc49eda2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
drivers/spi/spi-s3c64xx.c
View File

@ -163,9 +163,9 @@ struct s3c64xx_spi_port_config {
* struct s3c64xx_spi_driver_data - Runtime info holder for SPI driver. * struct s3c64xx_spi_driver_data - Runtime info holder for SPI driver.
* @clk: Pointer to the spi clock. * @clk: Pointer to the spi clock.
* @src_clk: Pointer to the clock used to generate SPI signals. * @src_clk: Pointer to the clock used to generate SPI signals.
* @ioclk: Pointer to the i/o clock between master and slave * @ioclk: Pointer to the i/o clock between host and target
* @pdev: Pointer to device's platform device data * @pdev: Pointer to device's platform device data
* @master: Pointer to the SPI Protocol master. * @host: Pointer to the SPI Protocol host.
* @cntrlr_info: Platform specific data for the controller this driver manages. * @cntrlr_info: Platform specific data for the controller this driver manages.
* @lock: Controller specific lock. * @lock: Controller specific lock.
* @state: Set of FLAGS to indicate status. * @state: Set of FLAGS to indicate status.
@ -186,7 +186,7 @@ struct s3c64xx_spi_driver_data {
struct clk *src_clk; struct clk *src_clk;
struct clk *ioclk; struct clk *ioclk;
struct platform_device *pdev; struct platform_device *pdev;
struct spi_master *master; struct spi_controller *host;
struct s3c64xx_spi_info *cntrlr_info; struct s3c64xx_spi_info *cntrlr_info;
spinlock_t lock; spinlock_t lock;
unsigned long sfr_start; unsigned long sfr_start;
@ -329,7 +329,7 @@ static int prepare_dma(struct s3c64xx_spi_dma_data *dma,
static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable) static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable)
{ {
struct s3c64xx_spi_driver_data *sdd = struct s3c64xx_spi_driver_data *sdd =
spi_master_get_devdata(spi->master); spi_controller_get_devdata(spi->controller);
if (sdd->cntrlr_info->no_cs) if (sdd->cntrlr_info->no_cs)
return; return;
@ -351,9 +351,9 @@ static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable)
} }
} }
static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) static int s3c64xx_spi_prepare_transfer(struct spi_controller *spi)
{ {
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(spi); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(spi);
if (is_polling(sdd)) if (is_polling(sdd))
return 0; return 0;
@ -381,9 +381,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
return 0; return 0;
} }
static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi) static int s3c64xx_spi_unprepare_transfer(struct spi_controller *spi)
{ {
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(spi); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(spi);
if (is_polling(sdd)) if (is_polling(sdd))
return 0; return 0;
@ -399,11 +399,11 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)
return 0; return 0;
} }
static bool s3c64xx_spi_can_dma(struct spi_master *master, static bool s3c64xx_spi_can_dma(struct spi_controller *host,
struct spi_device *spi, struct spi_device *spi,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
if (sdd->rx_dma.ch && sdd->tx_dma.ch) { if (sdd->rx_dma.ch && sdd->tx_dma.ch) {
return xfer->len > (FIFO_LVL_MASK(sdd) >> 1) + 1; return xfer->len > (FIFO_LVL_MASK(sdd) >> 1) + 1;
@ -712,10 +712,10 @@ static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
#define XFER_DMAADDR_INVALID DMA_BIT_MASK(32) #define XFER_DMAADDR_INVALID DMA_BIT_MASK(32)
static int s3c64xx_spi_prepare_message(struct spi_master *master, static int s3c64xx_spi_prepare_message(struct spi_controller *host,
struct spi_message *msg) struct spi_message *msg)
{ {
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
struct spi_device *spi = msg->spi; struct spi_device *spi = msg->spi;
struct s3c64xx_spi_csinfo *cs = spi->controller_data; struct s3c64xx_spi_csinfo *cs = spi->controller_data;
@ -736,11 +736,11 @@ static size_t s3c64xx_spi_max_transfer_size(struct spi_device *spi)
return ctlr->can_dma ? S3C64XX_SPI_PACKET_CNT_MASK : SIZE_MAX; return ctlr->can_dma ? S3C64XX_SPI_PACKET_CNT_MASK : SIZE_MAX;
} }
static int s3c64xx_spi_transfer_one(struct spi_master *master, static int s3c64xx_spi_transfer_one(struct spi_controller *host,
struct spi_device *spi, struct spi_device *spi,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1; const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1;
const void *tx_buf = NULL; const void *tx_buf = NULL;
void *rx_buf = NULL; void *rx_buf = NULL;
@ -890,15 +890,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
return status; return status;
} }
static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( static struct s3c64xx_spi_csinfo *s3c64xx_get_target_ctrldata(
struct spi_device *spi) struct spi_device *spi)
{ {
struct s3c64xx_spi_csinfo *cs; struct s3c64xx_spi_csinfo *cs;
struct device_node *slave_np, *data_np = NULL; struct device_node *target_np, *data_np = NULL;
u32 fb_delay = 0; u32 fb_delay = 0;
slave_np = spi->dev.of_node; target_np = spi->dev.of_node;
if (!slave_np) { if (!target_np) {
dev_err(&spi->dev, "device node not found\n"); dev_err(&spi->dev, "device node not found\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@ -907,7 +907,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
if (!cs) if (!cs)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
data_np = of_get_child_by_name(slave_np, "controller-data"); data_np = of_get_child_by_name(target_np, "controller-data");
if (!data_np) { if (!data_np) {
dev_info(&spi->dev, "feedback delay set to default (0)\n"); dev_info(&spi->dev, "feedback delay set to default (0)\n");
return cs; return cs;
@ -932,9 +932,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
int err; int err;
int div; int div;
sdd = spi_master_get_devdata(spi->master); sdd = spi_controller_get_devdata(spi->controller);
if (spi->dev.of_node) { if (spi->dev.of_node) {
cs = s3c64xx_get_slave_ctrldata(spi); cs = s3c64xx_get_target_ctrldata(spi);
spi->controller_data = cs; spi->controller_data = cs;
} }
@ -1022,7 +1022,7 @@ static void s3c64xx_spi_cleanup(struct spi_device *spi)
static irqreturn_t s3c64xx_spi_irq(int irq, void *data) static irqreturn_t s3c64xx_spi_irq(int irq, void *data)
{ {
struct s3c64xx_spi_driver_data *sdd = data; struct s3c64xx_spi_driver_data *sdd = data;
struct spi_master *spi = sdd->master; struct spi_controller *spi = sdd->host;
unsigned int val, clr = 0; unsigned int val, clr = 0;
val = readl(sdd->regs + S3C64XX_SPI_STATUS); val = readl(sdd->regs + S3C64XX_SPI_STATUS);
@ -1151,7 +1151,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
struct resource *mem_res; struct resource *mem_res;
struct s3c64xx_spi_driver_data *sdd; struct s3c64xx_spi_driver_data *sdd;
struct s3c64xx_spi_info *sci = dev_get_platdata(&pdev->dev); struct s3c64xx_spi_info *sci = dev_get_platdata(&pdev->dev);
struct spi_master *master; struct spi_controller *host;
int ret, irq; int ret, irq;
char clk_name[16]; char clk_name[16];
@ -1169,16 +1169,16 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
return irq; return irq;
master = devm_spi_alloc_master(&pdev->dev, sizeof(*sdd)); host = devm_spi_alloc_host(&pdev->dev, sizeof(*sdd));
if (!master) if (!host)
return dev_err_probe(&pdev->dev, -ENOMEM, return dev_err_probe(&pdev->dev, -ENOMEM,
"Unable to allocate SPI Master\n"); "Unable to allocate SPI Host\n");
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, host);
sdd = spi_master_get_devdata(master); sdd = spi_controller_get_devdata(host);
sdd->port_conf = s3c64xx_spi_get_port_config(pdev); sdd->port_conf = s3c64xx_spi_get_port_config(pdev);
sdd->master = master; sdd->host = host;
sdd->cntrlr_info = sci; sdd->cntrlr_info = sci;
sdd->pdev = pdev; sdd->pdev = pdev;
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
@ -1196,27 +1196,27 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
sdd->tx_dma.direction = DMA_MEM_TO_DEV; sdd->tx_dma.direction = DMA_MEM_TO_DEV;
sdd->rx_dma.direction = DMA_DEV_TO_MEM; sdd->rx_dma.direction = DMA_DEV_TO_MEM;
master->dev.of_node = pdev->dev.of_node; host->dev.of_node = pdev->dev.of_node;
master->bus_num = sdd->port_id; host->bus_num = sdd->port_id;
master->setup = s3c64xx_spi_setup; host->setup = s3c64xx_spi_setup;
master->cleanup = s3c64xx_spi_cleanup; host->cleanup = s3c64xx_spi_cleanup;
master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer; host->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer;
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer; host->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
master->prepare_message = s3c64xx_spi_prepare_message; host->prepare_message = s3c64xx_spi_prepare_message;
master->transfer_one = s3c64xx_spi_transfer_one; host->transfer_one = s3c64xx_spi_transfer_one;
master->max_transfer_size = s3c64xx_spi_max_transfer_size; host->max_transfer_size = s3c64xx_spi_max_transfer_size;
master->num_chipselect = sci->num_cs; host->num_chipselect = sci->num_cs;
master->use_gpio_descriptors = true; host->use_gpio_descriptors = true;
master->dma_alignment = 8; host->dma_alignment = 8;
master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) | host->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) |
SPI_BPW_MASK(8); SPI_BPW_MASK(8);
/* the spi->mode bits understood by this driver: */ /* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
if (sdd->port_conf->has_loopback) if (sdd->port_conf->has_loopback)
master->mode_bits |= SPI_LOOP; host->mode_bits |= SPI_LOOP;
master->auto_runtime_pm = true; host->auto_runtime_pm = true;
if (!is_polling(sdd)) if (!is_polling(sdd))
master->can_dma = s3c64xx_spi_can_dma; host->can_dma = s3c64xx_spi_can_dma;
sdd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); sdd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res);
if (IS_ERR(sdd->regs)) if (IS_ERR(sdd->regs))
@ -1271,14 +1271,14 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN, S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
sdd->regs + S3C64XX_SPI_INT_EN); sdd->regs + S3C64XX_SPI_INT_EN);
ret = devm_spi_register_master(&pdev->dev, master); ret = devm_spi_register_controller(&pdev->dev, host);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret); dev_err(&pdev->dev, "cannot register SPI host: %d\n", ret);
goto err_pm_put; goto err_pm_put;
} }
dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n", dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Targets attached\n",
sdd->port_id, master->num_chipselect); sdd->port_id, host->num_chipselect);
dev_dbg(&pdev->dev, "\tIOmem=[%pR]\tFIFO %dbytes\n", dev_dbg(&pdev->dev, "\tIOmem=[%pR]\tFIFO %dbytes\n",
mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1); mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1);
@ -1297,8 +1297,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
static void s3c64xx_spi_remove(struct platform_device *pdev) static void s3c64xx_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_controller *host = platform_get_drvdata(pdev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
pm_runtime_get_sync(&pdev->dev); pm_runtime_get_sync(&pdev->dev);
@ -1317,10 +1317,10 @@ static void s3c64xx_spi_remove(struct platform_device *pdev)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int s3c64xx_spi_suspend(struct device *dev) static int s3c64xx_spi_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
int ret = spi_master_suspend(master); int ret = spi_controller_suspend(host);
if (ret) if (ret)
return ret; return ret;
@ -1335,8 +1335,8 @@ static int s3c64xx_spi_suspend(struct device *dev)
static int s3c64xx_spi_resume(struct device *dev) static int s3c64xx_spi_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
struct s3c64xx_spi_info *sci = sdd->cntrlr_info; struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
int ret; int ret;
@ -1347,15 +1347,15 @@ static int s3c64xx_spi_resume(struct device *dev)
if (ret < 0) if (ret < 0)
return ret; return ret;
return spi_master_resume(master); return spi_controller_resume(host);
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int s3c64xx_spi_runtime_suspend(struct device *dev) static int s3c64xx_spi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
clk_disable_unprepare(sdd->clk); clk_disable_unprepare(sdd->clk);
clk_disable_unprepare(sdd->src_clk); clk_disable_unprepare(sdd->src_clk);
@ -1366,8 +1366,8 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
static int s3c64xx_spi_runtime_resume(struct device *dev) static int s3c64xx_spi_runtime_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
int ret; int ret;
if (sdd->port_conf->clk_ioclk) { if (sdd->port_conf->clk_ioclk) {