diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-11 03:28:09 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-12 05:37:17 -0500 |
commit | dfdf5f63b4380b9e719145c7cb2cb450a3d06ac4 (patch) | |
tree | ab0b47d1c1ba3378560c221cca5927664db3a253 /drivers/mmc | |
parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) |
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')
-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 @@ | |||
38 | #define MCI_CPSM_INTERRUPT (1 << 8) | 38 | #define MCI_CPSM_INTERRUPT (1 << 8) |
39 | #define MCI_CPSM_PENDING (1 << 9) | 39 | #define MCI_CPSM_PENDING (1 << 9) |
40 | #define MCI_CPSM_ENABLE (1 << 10) | 40 | #define MCI_CPSM_ENABLE (1 << 10) |
41 | #define MCI_SDIO_SUSP (1 << 11) | 41 | /* Argument flag extenstions in the ST Micro versions */ |
42 | #define MCI_ENCMD_COMPL (1 << 12) | 42 | #define MCI_ST_SDIO_SUSP (1 << 11) |
43 | #define MCI_NIEN (1 << 13) | 43 | #define MCI_ST_ENCMD_COMPL (1 << 12) |
44 | #define MCI_CE_ATACMD (1 << 14) | 44 | #define MCI_ST_NIEN (1 << 13) |
45 | #define MCI_ST_CE_ATACMD (1 << 14) | ||
45 | 46 | ||
46 | #define MMCIRESPCMD 0x010 | 47 | #define MMCIRESPCMD 0x010 |
47 | #define MMCIRESPONSE0 0x014 | 48 | #define MMCIRESPONSE0 0x014 |