spi: imx: remove unnecessary bit clearing in mx51_ecspi_config (c34de716) · Commits · 戴 / test

This reverts patch (spi: imx: fix ecspi mode setup) The patch tried to fix something by clearing bits in the cfg variable, but cfg is initialized to zero on function entry. There are no bits to clear. Signed-off-by:

Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/spi/spi-imx.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -366,20 +366,13 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx,

		if (config->mode & SPI_CPHA)
		cfg \|= MX51_ECSPI_CONFIG_SCLKPHA(config->cs);
		else
		cfg &= ~MX51_ECSPI_CONFIG_SCLKPHA(config->cs);

		if (config->mode & SPI_CPOL) {
		cfg \|= MX51_ECSPI_CONFIG_SCLKPOL(config->cs);
		cfg \|= MX51_ECSPI_CONFIG_SCLKCTL(config->cs);
		} else {
		cfg &= ~MX51_ECSPI_CONFIG_SCLKPOL(config->cs);
		cfg &= ~MX51_ECSPI_CONFIG_SCLKCTL(config->cs);
		}
		if (config->mode & SPI_CS_HIGH)
		cfg \|= MX51_ECSPI_CONFIG_SSBPOL(config->cs);
		else
		cfg &= ~MX51_ECSPI_CONFIG_SSBPOL(config->cs);

		/* CTRL register always go first to bring out controller from reset */
		writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);

Admin message