diff options
| -rw-r--r-- | drivers/spi/imx_spi.c | 8 | ||||
| -rw-r--r-- | include/spi/imx-spi.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 6805d22a75..81fa3b02ab 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -230,14 +230,8 @@ static unsigned int cspi_2_3_xchg_single(struct imx_spi *imx, unsigned int data) { void __iomem *base = imx->regs; - unsigned int cfg_reg = readl(base + CSPI_2_3_CTRL); - writel(data, base + CSPI_2_3_TXDATA); - cfg_reg |= CSPI_2_3_CTRL_XCH; - - writel(cfg_reg, base + CSPI_2_3_CTRL); - while (!(readl(base + CSPI_2_3_STAT) & CSPI_2_3_STAT_RR)); return readl(base + CSPI_2_3_RXDATA); @@ -306,6 +300,8 @@ static void cspi_2_3_chipselect(struct spi_device *spi, int is_active) ctrl |= (spi->bits_per_word - 1) << CSPI_2_3_CTRL_BL_OFFSET; + ctrl |= CSPI_2_3_CTRL_SMC; + cfg |= CSPI_2_3_CONFIG_SBBCTRL(cs); if (spi->mode & SPI_CPHA) diff --git a/include/spi/imx-spi.h b/include/spi/imx-spi.h index 560b092bd2..5c89634770 100644 --- a/include/spi/imx-spi.h +++ b/include/spi/imx-spi.h @@ -61,6 +61,7 @@ #define CSPI_2_3_CTRL 0x08 #define CSPI_2_3_CTRL_ENABLE (1 << 0) #define CSPI_2_3_CTRL_XCH (1 << 2) +#define CSPI_2_3_CTRL_SMC (1 << 3) #define CSPI_2_3_CTRL_MODE(cs) (1 << ((cs) + 4)) #define CSPI_2_3_CTRL_POSTDIV_OFFSET 8 #define CSPI_2_3_CTRL_PREDIV_OFFSET 12 |