spi/s3c64xx: Remove S3C_DMA support
Subsystems (3)
Mark Brown
maintainerPATCH 1/2 spi/s3c64xx: Remove S3C_DMA support
From: Mark Brown <[email protected]>
All the platforms which use the old S3C_DMA API have now been converted to dmaengine so we can remove the legacy code from the driver, simplifying maintenance.
Signed-off-by Mark Brown <[email protected]>
--- drivers/spi/spi-s3c64xx.c | 191 ---------------------------------------------- 1 file changed, 191 deletions(-)
drivers/spi/spi-s3c64xx.c +0 -191
@@ -34,10 +34,6 @@#include <linux/platform_data/spi-s3c64xx.h> -#ifdef CONFIG_S3C_DMA -#include <mach/dma.h> -#endif -#define MAX_SPI_PORTS 3#define S3C64XX_SPI_QUIRK_POLL (1 << 0)
@@ -200,9 +196,6 @@ struct s3c64xx_spi_driver_data {unsigned cur_speed;struct s3c64xx_spi_dma_data rx_dma;struct s3c64xx_spi_dma_data tx_dma; -#ifdef CONFIG_S3C_DMA -struct samsung_dma_ops *ops; -#endif struct s3c64xx_spi_port_config *port_conf;unsigned int port_id;bool cs_gpio;
@@ -284,180 +277,6 @@ static void s3c64xx_spi_dmacb(void *data)spin_unlock_irqrestore (&sdd->lock, flags); } -#ifdef CONFIG_S3C_DMA -/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */ - -static struct s3c2410_dma_client s3c64xx_spi_dma_client = { - .name ="samsung-spi-dma" , -}; - -static int s3c64xx_spi_map_mssg (struct s3c64xx_spi_driver_data *sdd, -struct spi_message *msg) -{ -struct device *dev = &sdd->pdev->dev; -struct spi_transfer *xfer; - -if (is_polling (sdd) || msg->is_dma_mapped) -return 0 ; - -/* First mark all xfer unmapped */ -list_for_each_entry (xfer, &msg->transfers, transfer_list) { - xfer->rx_dma =XFER_DMAADDR_INVALID ; - xfer->tx_dma =XFER_DMAADDR_INVALID ; - } - -/* Map until end or first fail */ -list_for_each_entry (xfer, &msg->transfers, transfer_list) { - -if (xfer->len <= ((FIFO_LVL_MASK (sdd) >>1 ) +1 )) -continue ; - -if (xfer->tx_buf !=NULL ) { - xfer->tx_dma =dma_map_single (dev, - (void *)xfer->tx_buf, xfer->len, -DMA_TO_DEVICE ); -if (dma_mapping_error (dev, xfer->tx_dma)) { -dev_err (dev,"dma_map_single Tx failed\n" ); - xfer->tx_dma =XFER_DMAADDR_INVALID ; -return -ENOMEM ; - } - } - -if (xfer->rx_buf !=NULL ) { - xfer->rx_dma =dma_map_single (dev, xfer->rx_buf, - xfer->len,DMA_FROM_DEVICE ); -if (dma_mapping_error (dev, xfer->rx_dma)) { -dev_err (dev,"dma_map_single Rx failed\n" ); -dma_unmap_single (dev, xfer->tx_dma, - xfer->len,DMA_TO_DEVICE ); - xfer->tx_dma =XFER_DMAADDR_INVALID ; - xfer->rx_dma =XFER_DMAADDR_INVALID ; -return -ENOMEM ; - } - } - } - -return 0 ; -} - -static void s3c64xx_spi_unmap_mssg (struct s3c64xx_spi_driver_data *sdd, -struct spi_message *msg) -{ -struct device *dev = &sdd->pdev->dev; -struct spi_transfer *xfer; - -if (is_polling (sdd) || msg->is_dma_mapped) -return ; - -list_for_each_entry (xfer, &msg->transfers, transfer_list) { - -if (xfer->len <= ((FIFO_LVL_MASK (sdd) >>1 ) +1 )) -continue ; - -if (xfer->rx_buf !=NULL - && xfer->rx_dma !=XFER_DMAADDR_INVALID ) -dma_unmap_single (dev, xfer->rx_dma, - xfer->len,DMA_FROM_DEVICE ); - -if (xfer->tx_buf !=NULL - && xfer->tx_dma !=XFER_DMAADDR_INVALID ) -dma_unmap_single (dev, xfer->tx_dma, - xfer->len,DMA_TO_DEVICE ); - } -} - -static void prepare_dma (struct s3c64xx_spi_dma_data *dma, -unsigned len,dma_addr_t buf) -{ -struct s3c64xx_spi_driver_data *sdd; -struct samsung_dma_prep info; -struct samsung_dma_config config; - -if (dma->direction ==DMA_DEV_TO_MEM ) { - sdd =container_of ((void *)dma, - struct s3c64xx_spi_driver_data, rx_dma); - config.direction = sdd->rx_dma.direction; - config.fifo = sdd->sfr_start +S3C64XX_SPI_RX_DATA ; - config.width = sdd->cur_bpw /8 ; - sdd->ops->config ((enum dma_ch )sdd->rx_dma.ch, &config); - }else { - sdd =container_of ((void *)dma, - struct s3c64xx_spi_driver_data, tx_dma); - config.direction = sdd->tx_dma.direction; - config.fifo = sdd->sfr_start +S3C64XX_SPI_TX_DATA ; - config.width = sdd->cur_bpw /8 ; - sdd->ops->config ((enum dma_ch )sdd->tx_dma.ch, &config); - } - - info.cap =DMA_SLAVE ; - info.len = len; - info.fp = s3c64xx_spi_dmacb; - info.fp_param = dma; - info.direction = dma->direction; - info.buf = buf; - - sdd->ops->prepare ((enum dma_ch )dma->ch, &info); - sdd->ops->trigger ((enum dma_ch )dma->ch); -} - -static int acquire_dma (struct s3c64xx_spi_driver_data *sdd) -{ -struct samsung_dma_req req; -struct device *dev = &sdd->pdev->dev; - - sdd->ops =samsung_dma_get_ops (); - - req.cap =DMA_SLAVE ; - req.client = &s3c64xx_spi_dma_client; - - sdd->rx_dma.ch = (struct dma_chan *)(unsigned long )sdd->ops->request ( - sdd->rx_dma.dmach, &req, dev,"rx" ); - sdd->tx_dma.ch = (struct dma_chan *)(unsigned long )sdd->ops->request ( - sdd->tx_dma.dmach, &req, dev,"tx" ); - -return 1 ; -} - -static int s3c64xx_spi_prepare_transfer (struct spi_master *spi) -{ -struct s3c64xx_spi_driver_data *sdd =spi_master_get_devdata (spi); - -/* -* If DMA resource was not available during -* probe, no need to continue with dma requests -* else Acquire DMA channels -*/ -while (!is_polling (sdd) && !acquire_dma (sdd)) -usleep_range (10000 ,11000 ); - -return 0 ; -} - -static int s3c64xx_spi_unprepare_transfer (struct spi_master *spi) -{ -struct s3c64xx_spi_driver_data *sdd =spi_master_get_devdata (spi); - -/* Free DMA channels */ -if (!is_polling (sdd)) { - sdd->ops->release ((enum dma_ch )sdd->rx_dma.ch, - &s3c64xx_spi_dma_client); - sdd->ops->release ((enum dma_ch )sdd->tx_dma.ch, - &s3c64xx_spi_dma_client); - } - -return 0 ; -} - -static void s3c64xx_spi_dma_stop (struct s3c64xx_spi_driver_data *sdd, -struct s3c64xx_spi_dma_data *dma) -{ - sdd->ops->stop ((enum dma_ch )dma->ch); -} - -#define s3c64xx_spi_can_dma NULL - -#else -static int s3c64xx_spi_map_mssg (struct s3c64xx_spi_driver_data *sdd,struct spi_message *msg) {
@@ -583,8 +402,6 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master,return xfer->len > (FIFO_LVL_MASK (sdd) >>1 ) +1 ; } -#endif -static void enable_datapath (struct s3c64xx_spi_driver_data *sdd,struct spi_device *spi,struct spi_transfer *xfer,int dma_mode)
@@ -616,11 +433,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, chcfg |=S3C64XX_SPI_CH_TXCH_ON ;if (dma_mode) { modecfg |=S3C64XX_SPI_MODE_TXDMA_ON ; -#ifndef CONFIG_S3C_DMA prepare_dma (&sdd->tx_dma, &xfer->tx_sg); -#else -prepare_dma (&sdd->tx_dma, xfer->len, xfer->tx_dma); -#endif }else {switch (sdd->cur_bpw) {case 32 :
@@ -652,11 +465,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,writel (((xfer->len *8 / sdd->cur_bpw) &0xffff ) |S3C64XX_SPI_PACKET_CNT_EN , regs +S3C64XX_SPI_PACKET_CNT ); -#ifndef CONFIG_S3C_DMA prepare_dma (&sdd->rx_dma, &xfer->rx_sg); -#else -prepare_dma (&sdd->rx_dma, xfer->len, xfer->rx_dma); -#endif } }
Signature · 1 line
1.9.rc1
A message that is not in the archive (sent off-list or not yet received): 1391778692-20129-1-git-send-email-broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
PATCH 2/2 spi/s3c64xx: Remove code no longer needed as a result of S3C_DMA removal
From: Mark Brown <[email protected]>
Remove functions that only had an effect when using S3C_DMA and inline dmaengine_terminate_all() since it's pointless to have a function which expands to a single function call.
Signed-off-by Mark Brown <[email protected]>
--- drivers/spi/spi-s3c64xx.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-)
drivers/spi/spi-s3c64xx.c +2 -37
@@ -277,17 +277,6 @@ static void s3c64xx_spi_dmacb(void *data)spin_unlock_irqrestore (&sdd->lock, flags); } -static int s3c64xx_spi_map_mssg (struct s3c64xx_spi_driver_data *sdd, -struct spi_message *msg) -{ -return 0 ; -} - -static void s3c64xx_spi_unmap_mssg (struct s3c64xx_spi_driver_data *sdd, -struct spi_message *msg) -{ -} -static void prepare_dma (struct s3c64xx_spi_dma_data *dma,struct sg_table *sgt) {
@@ -387,12 +376,6 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)return 0 ; } -static void s3c64xx_spi_dma_stop (struct s3c64xx_spi_driver_data *sdd, -struct s3c64xx_spi_dma_data *dma) -{ -dmaengine_terminate_all (dma->ch); -} -static bool s3c64xx_spi_can_dma (struct spi_master *master,struct spi_device *spi,struct spi_transfer *xfer)
@@ -691,13 +674,6 @@ static int s3c64xx_spi_prepare_message(struct spi_master *master,s3c64xx_spi_config (sdd); } -/* Map all the transfers if needed */ -if (s3c64xx_spi_map_mssg (sdd, msg)) { -dev_err (&spi->dev, -"Xfer: Unable to map message buffers!\n" ); -return -ENOMEM ; - } -/* Configure feedback delay */ writel (cs->fb_delay &0x3 , sdd->regs +S3C64XX_SPI_FB_CLK );
@@ -769,10 +745,10 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,if (use_dma) {if (xfer->tx_buf !=NULL && (sdd->state &TXBUSY )) -s3c64xx_spi_dma_stop (sdd, &sdd->tx_dma); +dmaengine_terminate_all (sdd->tx_dma.ch);if (xfer->rx_buf !=NULL && (sdd->state &RXBUSY )) -s3c64xx_spi_dma_stop (sdd, &sdd->rx_dma); +dmaengine_terminate_all (sdd->rx_dma.ch); } }else {flush_fifo (sdd);
@@ -781,16 +757,6 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,return status; } -static int s3c64xx_spi_unprepare_message (struct spi_master *master, -struct spi_message *msg) -{ -struct s3c64xx_spi_driver_data *sdd =spi_master_get_devdata (master); - -s3c64xx_spi_unmap_mssg (sdd, msg); - -return 0 ; -} -static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata (struct spi_device *spi) {
@@ -1164,7 +1130,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer; master->prepare_message = s3c64xx_spi_prepare_message; master->transfer_one = s3c64xx_spi_transfer_one; - master->unprepare_message = s3c64xx_spi_unprepare_message; master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer; master->num_chipselect = sci->num_cs; master->dma_alignment =8 ;
Signature · 6 lines
1.9.rc1 -- 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