diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-10-08 19:12:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-08 19:12:28 +0100 |
| commit | 2b60d727cb2e059e0569b937e742e93423ae1541 (patch) | |
| tree | 6e16732ab66073675f848df1c98a76b067b60882 /drivers/spi/spi-mxic.c | |
| parent | spi: spi-fsl-dspi: Implement the PTP system timestamping for TCFQ mode (diff) | |
| parent | spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register (diff) | |
| download | linux-dev-2b60d727cb2e059e0569b937e742e93423ae1541.tar.xz linux-dev-2b60d727cb2e059e0569b937e742e93423ae1541.zip | |
Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.5
Diffstat (limited to 'drivers/spi/spi-mxic.c')
| -rw-r--r-- | drivers/spi/spi-mxic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index 409bfa163647..69491f3a515d 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -145,8 +145,8 @@ #define LWR_SUSP_CTRL_EN BIT(31) #define DMAS_CTRL 0x9c -#define DMAS_CTRL_DIR_READ BIT(31) -#define DMAS_CTRL_EN BIT(30) +#define DMAS_CTRL_EN BIT(31) +#define DMAS_CTRL_DIR_READ BIT(30) #define DATA_STROB 0xa0 #define DATA_STROB_EDO_EN BIT(2) @@ -275,7 +275,7 @@ static void mxic_spi_hw_init(struct mxic_spi *mxic) writel(0, mxic->regs + HC_EN); writel(0, mxic->regs + LRD_CFG); writel(0, mxic->regs + LRD_CTRL); - writel(HC_CFG_NIO(1) | HC_CFG_TYPE(0, HC_CFG_TYPE_SPI_NAND) | + writel(HC_CFG_NIO(1) | HC_CFG_TYPE(0, HC_CFG_TYPE_SPI_NOR) | HC_CFG_SLV_ACT(0) | HC_CFG_MAN_CS_EN | HC_CFG_IDLE_SIO_LVL(1), mxic->regs + HC_CFG); } |