Skip to content

Commit 90bbb00

Browse files
Yang Yingliangbroonie
Yang Yingliang
authored and
broonie
committed
spi: sunplus-sp7021: switch to use modern name
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-9-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 9f55bb7 commit 90bbb00

1 file changed

Lines changed: 44 additions & 44 deletions

File tree

‎drivers/spi/spi-sunplus-sp7021.c‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
#define SP7021_FIFO_DATA_LEN (16)
7171

7272
enum {
73-
SP7021_MASTER_MODE = 0,
74-
SP7021_SLAVE_MODE = 1,
73+
SP7021_HOST_MODE = 0,
74+
SP7021_TARGET_MODE = 1,
7575
};
7676

7777
struct sp7021_spi_ctlr {
@@ -88,41 +88,41 @@ struct sp7021_spi_ctlr {
8888
// data xfer lock
8989
struct mutex buf_lock;
9090
struct completion isr_done;
91-
struct completion slave_isr;
91+
struct completion target_isr;
9292
unsigned int rx_cur_len;
9393
unsigned int tx_cur_len;
9494
unsigned int data_unit;
9595
const u8 *tx_buf;
9696
u8 *rx_buf;
9797
};
9898

99-
static irqreturn_t sp7021_spi_slave_irq(int irq, void *dev)
99+
static irqreturn_t sp7021_spi_target_irq(int irq, void *dev)
100100
{
101101
struct sp7021_spi_ctlr *pspim = dev;
102102
unsigned int data_status;
103103

104104
data_status = readl(pspim->s_base + SP7021_DATA_RDY_REG);
105105
data_status |= SP7021_SLAVE_CLR_INT;
106106
writel(data_status , pspim->s_base + SP7021_DATA_RDY_REG);
107-
complete(&pspim->slave_isr);
107+
complete(&pspim->target_isr);
108108
return IRQ_HANDLED;
109109
}
110110

111-
static int sp7021_spi_slave_abort(struct spi_controller *ctlr)
111+
static int sp7021_spi_target_abort(struct spi_controller *ctlr)
112112
{
113-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
113+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
114114

115-
complete(&pspim->slave_isr);
115+
complete(&pspim->target_isr);
116116
complete(&pspim->isr_done);
117117
return 0;
118118
}
119119

120-
static int sp7021_spi_slave_tx(struct spi_device *spi, struct spi_transfer *xfer)
120+
static int sp7021_spi_target_tx(struct spi_device *spi, struct spi_transfer *xfer)
121121
{
122122
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(spi->controller);
123123
u32 value;
124124

125-
reinit_completion(&pspim->slave_isr);
125+
reinit_completion(&pspim->target_isr);
126126
value = SP7021_SLAVE_DMA_EN | SP7021_SLAVE_DMA_RW | FIELD_PREP(SP7021_SLAVE_DMA_CMD, 3);
127127
writel(value, pspim->s_base + SP7021_SLAVE_DMA_CTRL_REG);
128128
writel(xfer->len, pspim->s_base + SP7021_SLAVE_DMA_LENGTH_REG);
@@ -137,7 +137,7 @@ static int sp7021_spi_slave_tx(struct spi_device *spi, struct spi_transfer *xfer
137137
return 0;
138138
}
139139

140-
static int sp7021_spi_slave_rx(struct spi_device *spi, struct spi_transfer *xfer)
140+
static int sp7021_spi_target_rx(struct spi_device *spi, struct spi_transfer *xfer)
141141
{
142142
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(spi->controller);
143143
u32 value;
@@ -155,7 +155,7 @@ static int sp7021_spi_slave_rx(struct spi_device *spi, struct spi_transfer *xfer
155155
return 0;
156156
}
157157

158-
static void sp7021_spi_master_rb(struct sp7021_spi_ctlr *pspim, unsigned int len)
158+
static void sp7021_spi_host_rb(struct sp7021_spi_ctlr *pspim, unsigned int len)
159159
{
160160
int i;
161161

@@ -166,7 +166,7 @@ static void sp7021_spi_master_rb(struct sp7021_spi_ctlr *pspim, unsigned int len
166166
}
167167
}
168168

169-
static void sp7021_spi_master_wb(struct sp7021_spi_ctlr *pspim, unsigned int len)
169+
static void sp7021_spi_host_wb(struct sp7021_spi_ctlr *pspim, unsigned int len)
170170
{
171171
int i;
172172

@@ -177,7 +177,7 @@ static void sp7021_spi_master_wb(struct sp7021_spi_ctlr *pspim, unsigned int len
177177
}
178178
}
179179

180-
static irqreturn_t sp7021_spi_master_irq(int irq, void *dev)
180+
static irqreturn_t sp7021_spi_host_irq(int irq, void *dev)
181181
{
182182
struct sp7021_spi_ctlr *pspim = dev;
183183
unsigned int tx_cnt, total_len;
@@ -206,9 +206,9 @@ static irqreturn_t sp7021_spi_master_irq(int irq, void *dev)
206206
fd_status, rx_cnt, tx_cnt, tx_len);
207207

208208
if (rx_cnt > 0)
209-
sp7021_spi_master_rb(pspim, rx_cnt);
209+
sp7021_spi_host_rb(pspim, rx_cnt);
210210
if (tx_cnt > 0)
211-
sp7021_spi_master_wb(pspim, tx_cnt);
211+
sp7021_spi_host_wb(pspim, tx_cnt);
212212

213213
fd_status = readl(pspim->m_base + SP7021_SPI_STATUS_REG);
214214
tx_len = FIELD_GET(SP7021_TX_LEN_MASK, fd_status);
@@ -224,7 +224,7 @@ static irqreturn_t sp7021_spi_master_irq(int irq, void *dev)
224224
rx_cnt = FIELD_GET(SP7021_RX_CNT_MASK, fd_status);
225225

226226
if (rx_cnt > 0)
227-
sp7021_spi_master_rb(pspim, rx_cnt);
227+
sp7021_spi_host_rb(pspim, rx_cnt);
228228
}
229229
value = readl(pspim->m_base + SP7021_INT_BUSY_REG);
230230
value |= SP7021_CLR_MASTER_INT;
@@ -240,7 +240,7 @@ static irqreturn_t sp7021_spi_master_irq(int irq, void *dev)
240240

241241
static void sp7021_prep_transfer(struct spi_controller *ctlr, struct spi_device *spi)
242242
{
243-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
243+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
244244

245245
pspim->tx_cur_len = 0;
246246
pspim->rx_cur_len = 0;
@@ -251,7 +251,7 @@ static void sp7021_prep_transfer(struct spi_controller *ctlr, struct spi_device
251251
static int sp7021_spi_controller_prepare_message(struct spi_controller *ctlr,
252252
struct spi_message *msg)
253253
{
254-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
254+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
255255
struct spi_device *s = msg->spi;
256256
u32 valus, rs = 0;
257257

@@ -283,7 +283,7 @@ static int sp7021_spi_controller_prepare_message(struct spi_controller *ctlr,
283283

284284
static void sp7021_spi_setup_clk(struct spi_controller *ctlr, struct spi_transfer *xfer)
285285
{
286-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
286+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
287287
u32 clk_rate, clk_sel, div;
288288

289289
clk_rate = clk_get_rate(pspim->spi_clk);
@@ -295,10 +295,10 @@ static void sp7021_spi_setup_clk(struct spi_controller *ctlr, struct spi_transfe
295295
writel(pspim->xfer_conf, pspim->m_base + SP7021_SPI_CONFIG_REG);
296296
}
297297

298-
static int sp7021_spi_master_transfer_one(struct spi_controller *ctlr, struct spi_device *spi,
298+
static int sp7021_spi_host_transfer_one(struct spi_controller *ctlr, struct spi_device *spi,
299299
struct spi_transfer *xfer)
300300
{
301-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
301+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
302302
unsigned long timeout = msecs_to_jiffies(1000);
303303
unsigned int xfer_cnt, xfer_len, last_len;
304304
unsigned int i, len_temp;
@@ -323,7 +323,7 @@ static int sp7021_spi_master_transfer_one(struct spi_controller *ctlr, struct sp
323323

324324
if (pspim->tx_cur_len < xfer_len) {
325325
len_temp = min(pspim->data_unit, xfer_len);
326-
sp7021_spi_master_wb(pspim, len_temp);
326+
sp7021_spi_host_wb(pspim, len_temp);
327327
}
328328
reg_temp = readl(pspim->m_base + SP7021_SPI_CONFIG_REG);
329329
reg_temp &= ~SP7021_CLEAN_RW_BYTE;
@@ -359,10 +359,10 @@ static int sp7021_spi_master_transfer_one(struct spi_controller *ctlr, struct sp
359359
return 0;
360360
}
361361

362-
static int sp7021_spi_slave_transfer_one(struct spi_controller *ctlr, struct spi_device *spi,
362+
static int sp7021_spi_target_transfer_one(struct spi_controller *ctlr, struct spi_device *spi,
363363
struct spi_transfer *xfer)
364364
{
365-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
365+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
366366
struct device *dev = pspim->dev;
367367
int ret;
368368

@@ -371,14 +371,14 @@ static int sp7021_spi_slave_transfer_one(struct spi_controller *ctlr, struct spi
371371
xfer->len, DMA_TO_DEVICE);
372372
if (dma_mapping_error(dev, xfer->tx_dma))
373373
return -ENOMEM;
374-
ret = sp7021_spi_slave_tx(spi, xfer);
374+
ret = sp7021_spi_target_tx(spi, xfer);
375375
dma_unmap_single(dev, xfer->tx_dma, xfer->len, DMA_TO_DEVICE);
376376
} else if (xfer->rx_buf && !xfer->tx_buf) {
377377
xfer->rx_dma = dma_map_single(dev, xfer->rx_buf, xfer->len,
378378
DMA_FROM_DEVICE);
379379
if (dma_mapping_error(dev, xfer->rx_dma))
380380
return -ENOMEM;
381-
ret = sp7021_spi_slave_rx(spi, xfer);
381+
ret = sp7021_spi_target_rx(spi, xfer);
382382
dma_unmap_single(dev, xfer->rx_dma, xfer->len, DMA_FROM_DEVICE);
383383
} else {
384384
dev_dbg(&ctlr->dev, "%s() wrong command\n", __func__);
@@ -409,32 +409,32 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev)
409409
pdev->id = of_alias_get_id(pdev->dev.of_node, "sp_spi");
410410

411411
if (device_property_read_bool(dev, "spi-slave"))
412-
mode = SP7021_SLAVE_MODE;
412+
mode = SP7021_TARGET_MODE;
413413
else
414-
mode = SP7021_MASTER_MODE;
414+
mode = SP7021_HOST_MODE;
415415

416-
if (mode == SP7021_SLAVE_MODE)
417-
ctlr = devm_spi_alloc_slave(dev, sizeof(*pspim));
416+
if (mode == SP7021_TARGET_MODE)
417+
ctlr = devm_spi_alloc_target(dev, sizeof(*pspim));
418418
else
419-
ctlr = devm_spi_alloc_master(dev, sizeof(*pspim));
419+
ctlr = devm_spi_alloc_host(dev, sizeof(*pspim));
420420
if (!ctlr)
421421
return -ENOMEM;
422422
device_set_node(&ctlr->dev, dev_fwnode(dev));
423423
ctlr->bus_num = pdev->id;
424424
ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
425425
ctlr->auto_runtime_pm = true;
426426
ctlr->prepare_message = sp7021_spi_controller_prepare_message;
427-
if (mode == SP7021_SLAVE_MODE) {
428-
ctlr->transfer_one = sp7021_spi_slave_transfer_one;
429-
ctlr->slave_abort = sp7021_spi_slave_abort;
427+
if (mode == SP7021_TARGET_MODE) {
428+
ctlr->transfer_one = sp7021_spi_target_transfer_one;
429+
ctlr->target_abort = sp7021_spi_target_abort;
430430
ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX;
431431
} else {
432432
ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
433433
ctlr->min_speed_hz = 40000;
434434
ctlr->max_speed_hz = 25000000;
435435
ctlr->use_gpio_descriptors = true;
436436
ctlr->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;
437-
ctlr->transfer_one = sp7021_spi_master_transfer_one;
437+
ctlr->transfer_one = sp7021_spi_host_transfer_one;
438438
}
439439
platform_set_drvdata(pdev, ctlr);
440440
pspim = spi_controller_get_devdata(ctlr);
@@ -443,7 +443,7 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev)
443443
pspim->dev = dev;
444444
mutex_init(&pspim->buf_lock);
445445
init_completion(&pspim->isr_done);
446-
init_completion(&pspim->slave_isr);
446+
init_completion(&pspim->target_isr);
447447

448448
pspim->m_base = devm_platform_ioremap_resource_byname(pdev, "master");
449449
if (IS_ERR(pspim->m_base))
@@ -485,12 +485,12 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev)
485485
if (ret)
486486
return ret;
487487

488-
ret = devm_request_irq(dev, pspim->m_irq, sp7021_spi_master_irq,
488+
ret = devm_request_irq(dev, pspim->m_irq, sp7021_spi_host_irq,
489489
IRQF_TRIGGER_RISING, pdev->name, pspim);
490490
if (ret)
491491
return ret;
492492

493-
ret = devm_request_irq(dev, pspim->s_irq, sp7021_spi_slave_irq,
493+
ret = devm_request_irq(dev, pspim->s_irq, sp7021_spi_target_irq,
494494
IRQF_TRIGGER_RISING, pdev->name, pspim);
495495
if (ret)
496496
return ret;
@@ -499,7 +499,7 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev)
499499
ret = spi_register_controller(ctlr);
500500
if (ret) {
501501
pm_runtime_disable(dev);
502-
return dev_err_probe(dev, ret, "spi_register_master fail\n");
502+
return dev_err_probe(dev, ret, "spi_register_controller fail\n");
503503
}
504504
return 0;
505505
}
@@ -516,15 +516,15 @@ static void sp7021_spi_controller_remove(struct platform_device *pdev)
516516
static int __maybe_unused sp7021_spi_controller_suspend(struct device *dev)
517517
{
518518
struct spi_controller *ctlr = dev_get_drvdata(dev);
519-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
519+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
520520

521521
return reset_control_assert(pspim->rstc);
522522
}
523523

524524
static int __maybe_unused sp7021_spi_controller_resume(struct device *dev)
525525
{
526526
struct spi_controller *ctlr = dev_get_drvdata(dev);
527-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
527+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
528528

529529
reset_control_deassert(pspim->rstc);
530530
return clk_prepare_enable(pspim->spi_clk);
@@ -534,15 +534,15 @@ static int __maybe_unused sp7021_spi_controller_resume(struct device *dev)
534534
static int sp7021_spi_runtime_suspend(struct device *dev)
535535
{
536536
struct spi_controller *ctlr = dev_get_drvdata(dev);
537-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
537+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
538538

539539
return reset_control_assert(pspim->rstc);
540540
}
541541

542542
static int sp7021_spi_runtime_resume(struct device *dev)
543543
{
544544
struct spi_controller *ctlr = dev_get_drvdata(dev);
545-
struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
545+
struct sp7021_spi_ctlr *pspim = spi_controller_get_devdata(ctlr);
546546

547547
return reset_control_deassert(pspim->rstc);
548548
}

0 commit comments

Comments
 (0)