diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-24 09:20:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-26 11:04:14 +0900 |
| commit | c34de7168cd201ab757b11bfc7899953948d7753 (patch) | |
| tree | 2c8075649029b09d4b47ff8d94df5959a2201c7e /drivers | |
| parent | f12ae171c7ce8633a6dd6dea4c50fd6cb72f433a (diff) | |
| download | op-kernel-dev-c34de7168cd201ab757b11bfc7899953948d7753.zip op-kernel-dev-c34de7168cd201ab757b11bfc7899953948d7753.tar.gz | |
spi: imx: remove unnecessary bit clearing in mx51_ecspi_config
This reverts patch 1476253cef (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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-imx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 15b23f0..287ec0c 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -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); |
