spi: coldfire-qspi: Fix getting correct address for *mcfqspi
PATCH 1/3 spi: coldfire-qspi: Fix getting correct address for *mcfqspi
dev_get_drvdata() returns the address of master rather than mcfqspi.
Signed-off-by Axel Lin <[email protected]>
--- drivers/spi/spi-coldfire-qspi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/spi-coldfire-qspi.c +4 -2
@@ -508,7 +508,8 @@ static int mcfqspi_resume(struct device *dev)#ifdef CONFIG_PM_RUNTIME static int mcfqspi_runtime_suspend (struct device *dev) { -struct mcfqspi *mcfqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); +struct mcfqspi *mcfqspi =spi_master_get_devdata (master);clk_disable (mcfqspi->clk);
@@ -517,7 +518,8 @@ static int mcfqspi_runtime_suspend(struct device *dev)static int mcfqspi_runtime_resume (struct device *dev) { -struct mcfqspi *mcfqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); +struct mcfqspi *mcfqspi =spi_master_get_devdata (master);clk_enable (mcfqspi->clk);
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/3 spi: coldfire-qspi: Remove unused dev field from struct mcfqspi
Also remove unused *res variable in mcfqspi_remove().
Signed-off-by Axel Lin <[email protected]>
--- drivers/spi/spi-coldfire-qspi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/spi/spi-coldfire-qspi.c +2 -6
@@ -77,8 +77,6 @@ struct mcfqspi {struct mcfqspi_cs_control *cs_control;wait_queue_head_t waitq; - -struct device *dev; };static void mcfqspi_wr_qmr (struct mcfqspi *mcfqspi,u16 val)
@@ -430,7 +428,6 @@ static int mcfqspi_probe(struct platform_device *pdev) }init_waitqueue_head (&mcfqspi->waitq); - mcfqspi->dev = &pdev->dev; master->mode_bits =SPI_CS_HIGH |SPI_CPOL |SPI_CPHA ; master->bits_per_word_mask =SPI_BPW_RANGE_MASK (8 ,16 );
@@ -445,7 +442,7 @@ static int mcfqspi_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"spi_register_master failed\n" ); goto fail2; } -pm_runtime_enable (mcfqspi->dev); +pm_runtime_enable (&pdev->dev);dev_info (&pdev->dev,"Coldfire QSPI bus driver\n" );
@@ -467,9 +464,8 @@ static int mcfqspi_remove(struct platform_device *pdev) {struct spi_master *master =platform_get_drvdata (pdev);struct mcfqspi *mcfqspi =spi_master_get_devdata (master); -struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -pm_runtime_disable (mcfqspi->dev); +pm_runtime_disable (&pdev->dev);/* disable the hardware (set the baud rate to 0) */ mcfqspi_wr_qmr (mcfqspi,MCFQSPI_QMR_MSTR );
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 spi: coldfire-qspi: Use core message handling
In reply to Axel LinConvert to use default implementation of transfer_one_message().
Signed-off-by Axel Lin <[email protected]>
---
Hi Steven,
I don't have this h/w, can you help testing if this patch works. Thanks,
Axel
drivers/spi/spi-coldfire-qspi.c | 81 +++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 47 deletions(-)
drivers/spi/spi-coldfire-qspi.c +34 -47
@@ -298,58 +298,44 @@ static void mcfqspi_transfer_msg16(struct mcfqspi *mcfqspi, unsigned count, } } -static int mcfqspi_transfer_one_message (struct spi_master *master, -struct spi_message *msg) +static void mcfqspi_set_cs (struct spi_device *spi,bool enable) { -struct mcfqspi *mcfqspi =spi_master_get_devdata (master); -struct spi_device *spi = msg->spi; -struct spi_transfer *t; -int status =0 ; - -list_for_each_entry (t, &msg->transfers, transfer_list) { -bool cs_high = spi->mode &SPI_CS_HIGH ; -u16 qmr =MCFQSPI_QMR_MSTR ; - - qmr |= t->bits_per_word <<10 ; -if (spi->mode &SPI_CPHA ) - qmr |=MCFQSPI_QMR_CPHA ; -if (spi->mode &SPI_CPOL ) - qmr |=MCFQSPI_QMR_CPOL ; -if (t->speed_hz) - qmr |=mcfqspi_qmr_baud (t->speed_hz); -else - qmr |=mcfqspi_qmr_baud (spi->max_speed_hz); -mcfqspi_wr_qmr (mcfqspi, qmr); +struct mcfqspi *mcfqspi =spi_master_get_devdata (spi->master); +bool cs_high = spi->mode &SPI_CS_HIGH ; +if (enable)mcfqspi_cs_select (mcfqspi, spi->chip_select, cs_high); +else +mcfqspi_cs_deselect (mcfqspi, spi->chip_select, cs_high); +} -mcfqspi_wr_qir (mcfqspi,MCFQSPI_QIR_SPIFE ); -if (t->bits_per_word ==8 ) -mcfqspi_transfer_msg8 (mcfqspi, t->len, t->tx_buf, - t->rx_buf); -else -mcfqspi_transfer_msg16 (mcfqspi, t->len /2 , t->tx_buf, - t->rx_buf); -mcfqspi_wr_qir (mcfqspi,0 ); - -if (t->delay_usecs) -udelay (t->delay_usecs); -if (t->cs_change) { -if (!list_is_last (&t->transfer_list, &msg->transfers)) -mcfqspi_cs_deselect (mcfqspi, spi->chip_select, - cs_high); - }else { -if (list_is_last (&t->transfer_list, &msg->transfers)) -mcfqspi_cs_deselect (mcfqspi, spi->chip_select, - cs_high); - } - msg->actual_length += t->len; - } - msg->status = status; -spi_finalize_current_message (master); +static int mcfqspi_transfer_one (struct spi_master *master, +struct spi_device *spi, +struct spi_transfer *t) +{ +struct mcfqspi *mcfqspi =spi_master_get_devdata (master); +u16 qmr =MCFQSPI_QMR_MSTR ; + + qmr |= t->bits_per_word <<10 ; +if (spi->mode &SPI_CPHA ) + qmr |=MCFQSPI_QMR_CPHA ; +if (spi->mode &SPI_CPOL ) + qmr |=MCFQSPI_QMR_CPOL ; +if (t->speed_hz) + qmr |=mcfqspi_qmr_baud (t->speed_hz); +else + qmr |=mcfqspi_qmr_baud (spi->max_speed_hz); +mcfqspi_wr_qmr (mcfqspi, qmr); -return status; +mcfqspi_wr_qir (mcfqspi,MCFQSPI_QIR_SPIFE ); +if (t->bits_per_word ==8 ) +mcfqspi_transfer_msg8 (mcfqspi, t->len, t->tx_buf, t->rx_buf); +else +mcfqspi_transfer_msg16 (mcfqspi, t->len /2 , t->tx_buf, + t->rx_buf); +mcfqspi_wr_qir (mcfqspi,0 ); +return 0 ; }static int mcfqspi_setup (struct spi_device *spi)
@@ -432,7 +418,8 @@ static int mcfqspi_probe(struct platform_device *pdev) master->mode_bits =SPI_CS_HIGH |SPI_CPOL |SPI_CPHA ; master->bits_per_word_mask =SPI_BPW_RANGE_MASK (8 ,16 ); master->setup = mcfqspi_setup; - master->transfer_one_message = mcfqspi_transfer_one_message; + master->set_cs = mcfqspi_set_cs; + master->transfer_one = mcfqspi_transfer_one; master->auto_runtime_pm = true;platform_set_drvdata (pdev, master);
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
AppliedQuoted 1 line · Axel Lin
dev_get_drvdata()returns the address of master rather than mcfqspi.
Applied all, thanks.