Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/imx' into spi-linus
This commit is contained in:
commit
d426a842b0
|
@ -342,8 +342,7 @@ static int dspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
|
||||||
/* Only alloc on first setup */
|
/* Only alloc on first setup */
|
||||||
chip = spi_get_ctldata(spi);
|
chip = spi_get_ctldata(spi);
|
||||||
if (chip == NULL) {
|
if (chip == NULL) {
|
||||||
chip = devm_kzalloc(&spi->dev, sizeof(struct chip_data),
|
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
|
||||||
GFP_KERNEL);
|
|
||||||
if (!chip)
|
if (!chip)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
@ -382,6 +381,16 @@ static int dspi_setup(struct spi_device *spi)
|
||||||
return dspi_setup_transfer(spi, NULL);
|
return dspi_setup_transfer(spi, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dspi_cleanup(struct spi_device *spi)
|
||||||
|
{
|
||||||
|
struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);
|
||||||
|
|
||||||
|
dev_dbg(&spi->dev, "spi_device %u.%u cleanup\n",
|
||||||
|
spi->master->bus_num, spi->chip_select);
|
||||||
|
|
||||||
|
kfree(chip);
|
||||||
|
}
|
||||||
|
|
||||||
static irqreturn_t dspi_interrupt(int irq, void *dev_id)
|
static irqreturn_t dspi_interrupt(int irq, void *dev_id)
|
||||||
{
|
{
|
||||||
struct fsl_dspi *dspi = (struct fsl_dspi *)dev_id;
|
struct fsl_dspi *dspi = (struct fsl_dspi *)dev_id;
|
||||||
|
@ -467,6 +476,7 @@ static int dspi_probe(struct platform_device *pdev)
|
||||||
dspi->bitbang.master->setup = dspi_setup;
|
dspi->bitbang.master->setup = dspi_setup;
|
||||||
dspi->bitbang.master->dev.of_node = pdev->dev.of_node;
|
dspi->bitbang.master->dev.of_node = pdev->dev.of_node;
|
||||||
|
|
||||||
|
master->cleanup = dspi_cleanup;
|
||||||
master->mode_bits = SPI_CPOL | SPI_CPHA;
|
master->mode_bits = SPI_CPOL | SPI_CPHA;
|
||||||
master->bits_per_word_mask = SPI_BPW_MASK(4) | SPI_BPW_MASK(8) |
|
master->bits_per_word_mask = SPI_BPW_MASK(4) | SPI_BPW_MASK(8) |
|
||||||
SPI_BPW_MASK(16);
|
SPI_BPW_MASK(16);
|
||||||
|
|
|
@ -823,6 +823,10 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
|
||||||
struct dma_slave_config slave_config = {};
|
struct dma_slave_config slave_config = {};
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
/* use pio mode for i.mx6dl chip TKT238285 */
|
||||||
|
if (of_machine_is_compatible("fsl,imx6dl"))
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* Prepare for TX DMA: */
|
/* Prepare for TX DMA: */
|
||||||
master->dma_tx = dma_request_slave_channel(dev, "tx");
|
master->dma_tx = dma_request_slave_channel(dev, "tx");
|
||||||
if (!master->dma_tx) {
|
if (!master->dma_tx) {
|
||||||
|
|
Loading…
Reference in New Issue