1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index f9deb84e4e55..0e5723ab47f0 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -336,13 +336,20 @@ 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);
 
         writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
         writel(cfg, spi_imx->base + MX51_ECSPI_CONFIG);