spi: sirf: move to use generic dma dt-binding (dd7243d6) · Commits · 戴 / test

drivers/spi/spi-sirf.c

+2 −24

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@
	#include <linux/dmaengine.h>		#include <linux/dmaengine.h>
	#include <linux/dma-direction.h>		#include <linux/dma-direction.h>
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
	#include <linux/sirfsoc_dma.h>

	#define DRIVER_NAME "sirfsoc_spi"		#define DRIVER_NAME "sirfsoc_spi"

	@@ -539,8 +538,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
	struct spi_master *master;		struct spi_master *master;
	struct resource *mem_res;		struct resource *mem_res;
	int num_cs, cs_gpio, irq;		int num_cs, cs_gpio, irq;
	u32 rx_dma_ch, tx_dma_ch;
	dma_cap_mask_t dma_cap_mask;
	int i;		int i;
	int ret;		int ret;

	@@ -551,20 +548,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
	goto err_cs;		goto err_cs;
	}		}

	ret = of_property_read_u32(pdev->dev.of_node,
	"sirf,spi-dma-rx-channel", &rx_dma_ch);
	if (ret < 0) {
	dev_err(&pdev->dev, "Unable to get rx dma channel\n");
	goto err_cs;
	}

	ret = of_property_read_u32(pdev->dev.of_node,
	"sirf,spi-dma-tx-channel", &tx_dma_ch);
	if (ret < 0) {
	dev_err(&pdev->dev, "Unable to get tx dma channel\n");
	goto err_cs;
	}

	master = spi_alloc_master(&pdev->dev, sizeof(sspi) + sizeof(int) num_cs);		master = spi_alloc_master(&pdev->dev, sizeof(sspi) + sizeof(int) num_cs);
	if (!master) {		if (!master) {
	dev_err(&pdev->dev, "Unable to allocate SPI master\n");		dev_err(&pdev->dev, "Unable to allocate SPI master\n");
	@@ -628,18 +611,13 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
	sspi->bitbang.master->dev.of_node = pdev->dev.of_node;		sspi->bitbang.master->dev.of_node = pdev->dev.of_node;

	/* request DMA channels */		/* request DMA channels */
	dma_cap_zero(dma_cap_mask);		sspi->rx_chan = dma_request_slave_channel(&pdev->dev, "rx");
	dma_cap_set(DMA_INTERLEAVE, dma_cap_mask);

	sspi->rx_chan = dma_request_channel(dma_cap_mask, (dma_filter_fn)sirfsoc_dma_filter_id,
	(void *)rx_dma_ch);
	if (!sspi->rx_chan) {		if (!sspi->rx_chan) {
	dev_err(&pdev->dev, "can not allocate rx dma channel\n");		dev_err(&pdev->dev, "can not allocate rx dma channel\n");
	ret = -ENODEV;		ret = -ENODEV;
	goto free_master;		goto free_master;
	}		}
	sspi->tx_chan = dma_request_channel(dma_cap_mask, (dma_filter_fn)sirfsoc_dma_filter_id,		sspi->tx_chan = dma_request_slave_channel(&pdev->dev, "tx");
	(void *)tx_dma_ch);
	if (!sspi->tx_chan) {		if (!sspi->tx_chan) {
	dev_err(&pdev->dev, "can not allocate tx dma channel\n");		dev_err(&pdev->dev, "can not allocate tx dma channel\n");
	ret = -ENODEV;		ret = -ENODEV;

Admin message