Unverified Commit 1cb3ebc4 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: sh-msiof: switch to use modern name 



Change legacy name master/slave to modern name host/target.

No functional changed.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230818093154.1183529-20-yangyingliang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0c8e5afc

drivers/spi/spi-sh-msiof.c

+25 −25
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct sh_msiof_spi_priv { 
	dma_addr_t rx_dma_addr;

	bool native_cs_inited;

	bool native_cs_high;

	bool slave_aborted;

	bool target_aborted;

};



#define MAX_SS	3	/* Maximum number of native chip selects */
@@ -361,7 +361,7 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p, u32 ss, 
	tmp |= !cs_high << SIMDR1_SYNCAC_SHIFT;

	tmp |= lsb_first << SIMDR1_BITLSB_SHIFT;

	tmp |= sh_msiof_spi_get_dtdl_and_syncdl(p);

	if (spi_controller_is_slave(p->ctlr)) {

	if (spi_controller_is_target(p->ctlr)) {

		sh_msiof_write(p, SITMDR1, tmp | SITMDR1_PCON);

	} else {

		sh_msiof_write(p, SITMDR1,
@@ -553,7 +553,7 @@ static int sh_msiof_spi_setup(struct spi_device *spi) 
		spi_controller_get_devdata(spi->controller);

	u32 clr, set, tmp;



	if (spi_get_csgpiod(spi, 0) || spi_controller_is_slave(p->ctlr))

	if (spi_get_csgpiod(spi, 0) || spi_controller_is_target(p->ctlr))

		return 0;



	if (p->native_cs_inited &&
@@ -602,11 +602,11 @@ static int sh_msiof_prepare_message(struct spi_controller *ctlr, 


static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf)

{

	bool slave = spi_controller_is_slave(p->ctlr);

	bool target = spi_controller_is_target(p->ctlr);

	int ret = 0;



	/* setup clock and rx/tx signals */

	if (!slave)

	if (!target)

		ret = sh_msiof_modify_ctr_wait(p, 0, SICTR_TSCKE);

	if (rx_buf && !ret)

		ret = sh_msiof_modify_ctr_wait(p, 0, SICTR_RXE);
@@ -614,7 +614,7 @@ static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf) 
		ret = sh_msiof_modify_ctr_wait(p, 0, SICTR_TXE);



	/* start by setting frame bit */

	if (!ret && !slave)

	if (!ret && !target)

		ret = sh_msiof_modify_ctr_wait(p, 0, SICTR_TFSE);



	return ret;
@@ -622,27 +622,27 @@ static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf) 


static int sh_msiof_spi_stop(struct sh_msiof_spi_priv *p, void *rx_buf)

{

	bool slave = spi_controller_is_slave(p->ctlr);

	bool target = spi_controller_is_target(p->ctlr);

	int ret = 0;



	/* shut down frame, rx/tx and clock signals */

	if (!slave)

	if (!target)

		ret = sh_msiof_modify_ctr_wait(p, SICTR_TFSE, 0);

	if (!ret)

		ret = sh_msiof_modify_ctr_wait(p, SICTR_TXE, 0);

	if (rx_buf && !ret)

		ret = sh_msiof_modify_ctr_wait(p, SICTR_RXE, 0);

	if (!ret && !slave)

	if (!ret && !target)

		ret = sh_msiof_modify_ctr_wait(p, SICTR_TSCKE, 0);



	return ret;

}



static int sh_msiof_slave_abort(struct spi_controller *ctlr)

static int sh_msiof_target_abort(struct spi_controller *ctlr)

{

	struct sh_msiof_spi_priv *p = spi_controller_get_devdata(ctlr);



	p->slave_aborted = true;

	p->target_aborted = true;

	complete(&p->done);

	complete(&p->done_txdma);

	return 0;
@@ -651,9 +651,9 @@ static int sh_msiof_slave_abort(struct spi_controller *ctlr) 
static int sh_msiof_wait_for_completion(struct sh_msiof_spi_priv *p,

					struct completion *x)

{

	if (spi_controller_is_slave(p->ctlr)) {

	if (spi_controller_is_target(p->ctlr)) {

		if (wait_for_completion_interruptible(x) ||

		    p->slave_aborted) {

		    p->target_aborted) {

			dev_dbg(&p->pdev->dev, "interrupted\n");

			return -EINTR;

		}
@@ -699,7 +699,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p, 
		tx_fifo(p, tx_buf, words, fifo_shift);



	reinit_completion(&p->done);

	p->slave_aborted = false;

	p->target_aborted = false;



	ret = sh_msiof_spi_start(p, rx_buf);

	if (ret) {
@@ -796,7 +796,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, 
	reinit_completion(&p->done);

	if (tx)

		reinit_completion(&p->done_txdma);

	p->slave_aborted = false;

	p->target_aborted = false;



	/* Now start DMA */

	if (rx)
@@ -925,7 +925,7 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr, 
	sh_msiof_spi_reset_regs(p);



	/* setup clocks (clock already enabled in chipselect()) */

	if (!spi_controller_is_slave(p->ctlr))

	if (!spi_controller_is_target(p->ctlr))

		sh_msiof_spi_set_clk_regs(p, t);



	while (ctlr->dma_tx && len > 15) {
@@ -1101,11 +1101,11 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev) 
	if (!info)

		return NULL;



	info->mode = of_property_read_bool(np, "spi-slave") ? MSIOF_SPI_SLAVE

							    : MSIOF_SPI_MASTER;

	info->mode = of_property_read_bool(np, "spi-slave") ? MSIOF_SPI_TARGET

							    : MSIOF_SPI_HOST;



	/* Parse the MSIOF properties */

	if (info->mode == MSIOF_SPI_MASTER)

	if (info->mode == MSIOF_SPI_HOST)

		of_property_read_u32(np, "num-cs", &num_cs);

	of_property_read_u32(np, "renesas,tx-fifo-size",

					&info->tx_fifo_override);
@@ -1279,11 +1279,11 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
		return -ENXIO;

	}



	if (info->mode == MSIOF_SPI_SLAVE)

		ctlr = spi_alloc_slave(&pdev->dev,

	if (info->mode == MSIOF_SPI_TARGET)

		ctlr = spi_alloc_target(&pdev->dev,

				        sizeof(struct sh_msiof_spi_priv));

	else

		ctlr = spi_alloc_master(&pdev->dev,

		ctlr = spi_alloc_host(&pdev->dev,

				      sizeof(struct sh_msiof_spi_priv));

	if (ctlr == NULL)

		return -ENOMEM;
@@ -1347,7 +1347,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
	ctlr->dev.of_node = pdev->dev.of_node;

	ctlr->setup = sh_msiof_spi_setup;

	ctlr->prepare_message = sh_msiof_prepare_message;

	ctlr->slave_abort = sh_msiof_slave_abort;

	ctlr->target_abort = sh_msiof_target_abort;

	ctlr->bits_per_word_mask = chipdata->bits_per_word_mask;

	ctlr->auto_runtime_pm = true;

	ctlr->transfer_one = sh_msiof_transfer_one;

include/linux/spi/sh_msiof.h

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
#define __SPI_SH_MSIOF_H__



enum {

	MSIOF_SPI_MASTER,

	MSIOF_SPI_SLAVE,

	MSIOF_SPI_HOST,

	MSIOF_SPI_TARGET,

};



struct sh_msiof_spi_info {