diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-11 09:28:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-12 11:37:17 +0100 |
| commit | dfdf5f63b4380b9e719145c7cb2cb450a3d06ac4 (patch) | |
| tree | ab0b47d1c1ba3378560c221cca5927664db3a253 /drivers/mmc/host/mmci.h | |
| parent | Linux 3.14-rc2 (diff) | |
| download | linux-dfdf5f63b4380b9e719145c7cb2cb450a3d06ac4.tar.xz linux-dfdf5f63b4380b9e719145c7cb2cb450a3d06ac4.zip | |
ARM: 7956/1: mmci: rename some extended flags
These four (so far unused) flags are only found in the ST Micro
versions of MMCI, so infix them properly with the _ST_ infix.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/host/mmci.h')
| -rw-r--r-- | drivers/mmc/host/mmci.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 168bc72f7a94..84c0e59b792a 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -38,10 +38,11 @@ #define MCI_CPSM_INTERRUPT (1 << 8) #define MCI_CPSM_PENDING (1 << 9) #define MCI_CPSM_ENABLE (1 << 10) -#define MCI_SDIO_SUSP (1 << 11) -#define MCI_ENCMD_COMPL (1 << 12) -#define MCI_NIEN (1 << 13) -#define MCI_CE_ATACMD (1 << 14) +/* Argument flag extenstions in the ST Micro versions */ +#define MCI_ST_SDIO_SUSP (1 << 11) +#define MCI_ST_ENCMD_COMPL (1 << 12) +#define MCI_ST_NIEN (1 << 13) +#define MCI_ST_CE_ATACMD (1 << 14) #define MMCIRESPCMD 0x010 #define MMCIRESPONSE0 0x014 |