Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 721483e2 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: dw: Convert to generalized SPI controller API 



Convert to generalized SPI controller API introduced by the
commit 8caab75f ("spi: Generalize SPI "master" to "controller"").
Inside driver variable name "master" is still used to indicate the driver
is master only.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb

drivers/spi/spi-dw-mid.c

+3 −3
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ static irqreturn_t dma_transfer(struct dw_spi *dws) 
	return IRQ_HANDLED;

}



static bool mid_spi_can_dma(struct spi_master *master, struct spi_device *spi,

		struct spi_transfer *xfer)

static bool mid_spi_can_dma(struct spi_controller *master,

		struct spi_device *spi, struct spi_transfer *xfer)

{

	struct dw_spi *dws = spi_master_get_devdata(master);

	struct dw_spi *dws = spi_controller_get_devdata(master);



	if (!dws->dma_inited)

		return false;

drivers/spi/spi-dw.c

+13 −13
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static inline void dw_spi_debugfs_remove(struct dw_spi *dws) 


static void dw_spi_set_cs(struct spi_device *spi, bool enable)

{

	struct dw_spi *dws = spi_master_get_devdata(spi->master);

	struct dw_spi *dws = spi_controller_get_devdata(spi->controller);

	struct chip_data *chip = spi_get_ctldata(spi);



	/* Chip select logic is inverted from spi_set_cs() */
@@ -250,8 +250,8 @@ static irqreturn_t interrupt_transfer(struct dw_spi *dws) 


static irqreturn_t dw_spi_irq(int irq, void *dev_id)

{

	struct spi_master *master = dev_id;

	struct dw_spi *dws = spi_master_get_devdata(master);

	struct spi_controller *master = dev_id;

	struct dw_spi *dws = spi_controller_get_devdata(master);

	u16 irq_status = dw_readl(dws, DW_SPI_ISR) & 0x3f;



	if (!irq_status)
@@ -277,10 +277,10 @@ static int poll_transfer(struct dw_spi *dws) 
	return 0;

}



static int dw_spi_transfer_one(struct spi_master *master,

static int dw_spi_transfer_one(struct spi_controller *master,

		struct spi_device *spi, struct spi_transfer *transfer)

{

	struct dw_spi *dws = spi_master_get_devdata(master);

	struct dw_spi *dws = spi_controller_get_devdata(master);

	struct chip_data *chip = spi_get_ctldata(spi);

	u8 imask = 0;

	u16 txlevel = 0;
@@ -383,10 +383,10 @@ static int dw_spi_transfer_one(struct spi_master *master, 
	return 1;

}



static void dw_spi_handle_err(struct spi_master *master,

static void dw_spi_handle_err(struct spi_controller *master,

		struct spi_message *msg)

{

	struct dw_spi *dws = spi_master_get_devdata(master);

	struct dw_spi *dws = spi_controller_get_devdata(master);



	if (dws->dma_mapped)

		dws->dma_ops->dma_stop(dws);
@@ -471,7 +471,7 @@ static void spi_hw_init(struct device *dev, struct dw_spi *dws) 


int dw_spi_add_host(struct device *dev, struct dw_spi *dws)

{

	struct spi_master *master;

	struct spi_controller *master;

	int ret;



	BUG_ON(dws == NULL);
@@ -518,8 +518,8 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) 
		}

	}



	spi_master_set_devdata(master, dws);

	ret = devm_spi_register_master(dev, master);

	spi_controller_set_devdata(master, dws);

	ret = devm_spi_register_controller(dev, master);

	if (ret) {

		dev_err(&master->dev, "problem registering spi master\n");

		goto err_dma_exit;
@@ -534,7 +534,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) 
	spi_enable_chip(dws, 0);

	free_irq(dws->irq, master);

err_free_master:

	spi_master_put(master);

	spi_controller_put(master);

	return ret;

}

EXPORT_SYMBOL_GPL(dw_spi_add_host);
@@ -556,7 +556,7 @@ int dw_spi_suspend_host(struct dw_spi *dws) 
{

	int ret;



	ret = spi_master_suspend(dws->master);

	ret = spi_controller_suspend(dws->master);

	if (ret)

		return ret;
@@ -570,7 +570,7 @@ int dw_spi_resume_host(struct dw_spi *dws) 
	int ret;



	spi_hw_init(&dws->master->dev, dws);

	ret = spi_master_resume(dws->master);

	ret = spi_controller_resume(dws->master);

	if (ret)

		dev_err(&dws->master->dev, "fail to start queue (%d)\n", ret);

	return ret;

drivers/spi/spi-dw.h

+2 −2
Original line number Diff line number Diff line
@@ -93,14 +93,14 @@ struct dw_spi_dma_ops { 
	int (*dma_init)(struct dw_spi *dws);

	void (*dma_exit)(struct dw_spi *dws);

	int (*dma_setup)(struct dw_spi *dws, struct spi_transfer *xfer);

	bool (*can_dma)(struct spi_master *master, struct spi_device *spi,

	bool (*can_dma)(struct spi_controller *master, struct spi_device *spi,

			struct spi_transfer *xfer);

	int (*dma_transfer)(struct dw_spi *dws, struct spi_transfer *xfer);

	void (*dma_stop)(struct dw_spi *dws);

};



struct dw_spi {

	struct spi_master	*master;

	struct spi_controller	*master;

	enum dw_ssi_type	type;



	void __iomem		*regs;