diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
| commit | 446d37c1acc76680770400fd90e6c502e49d72df (patch) | |
| tree | f309e83e262b0ee6e41d0f1bf92af9fb0e3faa18 /drivers/spi/fsl_qspi.c | |
| parent | ab0a6a5dba740afb490e6e7d417e345284e0dbec (diff) | |
| parent | bef87adf95e7ca923f866e27bbcccb2dad85df9f (diff) | |
| download | blackbird-obmc-uboot-446d37c1acc76680770400fd90e6c502e49d72df.tar.gz blackbird-obmc-uboot-446d37c1acc76680770400fd90e6c502e49d72df.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/fsl_qspi.c')
| -rw-r--r-- | drivers/spi/fsl_qspi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 02b557f0d9..ed391142be 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; #define TX_BUFFER_SIZE 0x40 #endif -#define OFFSET_BITS_MASK 0x00ffffff +#define OFFSET_BITS_MASK GENMASK(24, 0) #define FLASH_STATUS_WEL 0x02 @@ -68,7 +68,7 @@ DECLARE_GLOBAL_DATA_PTR; #define QSPI_CMD_SE_4B 0xdc /* Sector erase (usually 64KiB) */ /* fsl_qspi_platdata flags */ -#define QSPI_FLAG_REGMAP_ENDIAN_BIG (1 << 0) +#define QSPI_FLAG_REGMAP_ENDIAN_BIG BIT(0) /* default SCK frequency, unit: HZ */ #define FSL_QSPI_DEFAULT_SCK_FREQ 50000000 @@ -383,7 +383,7 @@ static void qspi_enable_ddr_mode(struct fsl_qspi_priv *priv) /* Enable the module again (enable the DDR too) */ reg |= QSPI_MCR_DDR_EN_MASK; /* Enable bit 29 for imx6sx */ - reg |= (1 << 29); + reg |= BIT(29); qspi_write32(priv->flags, ®s->mcr, reg); } |
