tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: Correct definition of R6
omap: Update MMC response types

Linus Torvalds e55cec4f 6d3154cc

+11 -14
unified split
-3
drivers/mmc/imxmmc.c
··· 351 case MMC_RSP_R3: /* short */ 352 cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3; 353 break; 354 - case MMC_RSP_R6: /* short CRC */ 355 - cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6; 356 - break; 357 default: 358 break; 359 }
··· 351 case MMC_RSP_R3: /* short */ 352 cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3; 353 break; 354 default: 355 break; 356 }
+9 -6
drivers/mmc/omap.c
··· 91 92 93 #define DRIVER_NAME "mmci-omap" 94 - #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) 95 96 /* Specifies how often in millisecs to poll for card status changes 97 * when the cover switch is open */ ··· 203 cmdtype = 0; 204 205 /* Our hardware needs to know exact type */ 206 - switch (RSP_TYPE(mmc_resp_type(cmd))) { 207 - case RSP_TYPE(MMC_RSP_R1): 208 - /* resp 1, resp 1b */ 209 resptype = 1; 210 break; 211 - case RSP_TYPE(MMC_RSP_R2): 212 resptype = 2; 213 break; 214 - case RSP_TYPE(MMC_RSP_R3): 215 resptype = 3; 216 break; 217 default: 218 break; 219 } 220
··· 91 92 93 #define DRIVER_NAME "mmci-omap" 94 95 /* Specifies how often in millisecs to poll for card status changes 96 * when the cover switch is open */ ··· 204 cmdtype = 0; 205 206 /* Our hardware needs to know exact type */ 207 + switch (mmc_resp_type(cmd)) { 208 + case MMC_RSP_NONE: 209 + break; 210 + case MMC_RSP_R1: 211 + case MMC_RSP_R1B: 212 + /* resp 1, 1b, 6, 7 */ 213 resptype = 1; 214 break; 215 + case MMC_RSP_R2: 216 resptype = 2; 217 break; 218 + case MMC_RSP_R3: 219 resptype = 3; 220 break; 221 default: 222 + dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd)); 223 break; 224 } 225
+1 -1
drivers/mmc/pxamci.c
··· 171 172 #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) 173 switch (RSP_TYPE(mmc_resp_type(cmd))) { 174 - case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */ 175 cmdat |= CMDAT_RESP_SHORT; 176 break; 177 case RSP_TYPE(MMC_RSP_R3):
··· 171 172 #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) 173 switch (RSP_TYPE(mmc_resp_type(cmd))) { 174 + case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */ 175 cmdat |= CMDAT_RESP_SHORT; 176 break; 177 case RSP_TYPE(MMC_RSP_R3):
-3
drivers/mmc/tifm_sd.c
··· 173 case MMC_RSP_R3: 174 rc |= TIFM_MMCSD_RSP_R3; 175 break; 176 - case MMC_RSP_R6: 177 - rc |= TIFM_MMCSD_RSP_R6; 178 - break; 179 default: 180 BUG(); 181 }
··· 173 case MMC_RSP_R3: 174 rc |= TIFM_MMCSD_RSP_R3; 175 break; 176 default: 177 BUG(); 178 }
+1 -1
include/linux/mmc/mmc.h
··· 42 #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) 43 #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) 44 #define MMC_RSP_R3 (MMC_RSP_PRESENT) 45 - #define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC) 46 47 #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) 48
··· 42 #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) 43 #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) 44 #define MMC_RSP_R3 (MMC_RSP_PRESENT) 45 + #define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) 46 47 #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) 48