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

Commit d629c2a0 authored by Sascha Hauer's avatar Sascha Hauer Committed by Mark Brown
Browse files

spi: imx: make some register defines simpler 



The watermark levels in the DMA register are write only, the driver
should never have to read them back from the hardware. Replace the
current _MASK and _OFFSET defines with defines taking the watermark
level directly.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c34de716

drivers/spi/spi-imx.c

+6 −9
Original line number Diff line number Diff line
@@ -256,12 +256,9 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, 
#define MX51_ECSPI_INT_RREN		(1 <<  3)



#define MX51_ECSPI_DMA      0x14

#define MX51_ECSPI_DMA_TX_WML_OFFSET	0

#define MX51_ECSPI_DMA_TX_WML_MASK	0x3F

#define MX51_ECSPI_DMA_RX_WML_OFFSET	16

#define MX51_ECSPI_DMA_RX_WML_MASK	(0x3F << 16)

#define MX51_ECSPI_DMA_RXT_WML_OFFSET	24

#define MX51_ECSPI_DMA_RXT_WML_MASK	(0x3F << 24)

#define MX51_ECSPI_DMA_TX_WML(wml)	((wml) & 0x3f)

#define MX51_ECSPI_DMA_RX_WML(wml)	(((wml) & 0x3f) << 16)

#define MX51_ECSPI_DMA_RXT_WML(wml)	(((wml) & 0x3f) << 24)



#define MX51_ECSPI_DMA_TEDEN		(1 << 7)

#define MX51_ECSPI_DMA_RXDEN		(1 << 23)
@@ -408,9 +405,9 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx, 
	 * and enable DMA request.

	 */



	writel(spi_imx->wml << MX51_ECSPI_DMA_RX_WML_OFFSET |

		spi_imx->wml << MX51_ECSPI_DMA_TX_WML_OFFSET |

		spi_imx->wml << MX51_ECSPI_DMA_RXT_WML_OFFSET |

	writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml) |

		MX51_ECSPI_DMA_TX_WML(spi_imx->wml) |

		MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) |

		MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN |

		MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA);