diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-03-16 07:49:04 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-03-27 12:20:20 -0400 |
| commit | 135111cc5595c6a24dd826d503e2d2bae92da1c4 (patch) | |
| tree | 8de38f57b81d999e02dc9d40d24cb667cac69dff | |
| parent | 7f524217439cc17da74523582c303cced432713e (diff) | |
mmc: sh_mmcif: simplify bitmask macros
Purely cosmetic readability improvement, no functional change.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | include/linux/mmc/sh_mmcif.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index 04ff452bf5c3..05f0e3db1c12 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h | |||
| @@ -77,18 +77,15 @@ struct sh_mmcif_plat_data { | |||
| 77 | 77 | ||
| 78 | /* CE_CLK_CTRL */ | 78 | /* CE_CLK_CTRL */ |
| 79 | #define CLK_ENABLE (1 << 24) /* 1: output mmc clock */ | 79 | #define CLK_ENABLE (1 << 24) /* 1: output mmc clock */ |
| 80 | #define CLK_CLEAR ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16)) | 80 | #define CLK_CLEAR (0xf << 16) |
| 81 | #define CLK_SUP_PCLK ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16)) | 81 | #define CLK_SUP_PCLK (0xf << 16) |
| 82 | #define CLKDIV_4 (1<<16) /* mmc clock frequency. | 82 | #define CLKDIV_4 (1 << 16) /* mmc clock frequency. |
| 83 | * n: bus clock/(2^(n+1)) */ | 83 | * n: bus clock/(2^(n+1)) */ |
| 84 | #define CLKDIV_256 (7<<16) /* mmc clock frequency. (see above) */ | 84 | #define CLKDIV_256 (7 << 16) /* mmc clock frequency. (see above) */ |
| 85 | #define SRSPTO_256 ((1 << 13) | (0 << 12)) /* resp timeout */ | 85 | #define SRSPTO_256 (2 << 12) /* resp timeout */ |
| 86 | #define SRBSYTO_29 ((1 << 11) | (1 << 10) | \ | 86 | #define SRBSYTO_29 (0xf << 8) /* resp busy timeout */ |
| 87 | (1 << 9) | (1 << 8)) /* resp busy timeout */ | 87 | #define SRWDTO_29 (0xf << 4) /* read/write timeout */ |
| 88 | #define SRWDTO_29 ((1 << 7) | (1 << 6) | \ | 88 | #define SCCSTO_29 (0xf << 0) /* ccs timeout */ |
| 89 | (1 << 5) | (1 << 4)) /* read/write timeout */ | ||
| 90 | #define SCCSTO_29 ((1 << 3) | (1 << 2) | \ | ||
| 91 | (1 << 1) | (1 << 0)) /* ccs timeout */ | ||
| 92 | 89 | ||
| 93 | /* CE_VERSION */ | 90 | /* CE_VERSION */ |
| 94 | #define SOFT_RST_ON (1 << 31) | 91 | #define SOFT_RST_ON (1 << 31) |