x86: pci: Do not assign irq 0 to pci device

[oweals/u-boot.git] / common / cmd_mmc.c

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 632ddae7a2f78fb9d2a07a9041b1f83d06286556..1335e3d344c4eb48f1227e53e519f2ef4b45c9e5 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -85,8 +85,12 @@ static void print_mmcinfo(struct mmc *mmc)
        printf("Tran Speed: %d\n", mmc->tran_speed);
        printf("Rd Block Len: %d\n", mmc->read_bl_len);
 
-       printf("%s version %d.%d\n", IS_SD(mmc) ? "SD" : "MMC",
-                       (mmc->version >> 8) & 0xf, mmc->version & 0xff);
+       printf("%s version %d.%d", IS_SD(mmc) ? "SD" : "MMC",
+                       EXTRACT_SDMMC_MAJOR_VERSION(mmc->version),
+                       EXTRACT_SDMMC_MINOR_VERSION(mmc->version));
+       if (EXTRACT_SDMMC_CHANGE_VERSION(mmc->version) != 0)
+               printf(".%d", EXTRACT_SDMMC_CHANGE_VERSION(mmc->version));
+       printf("\n");
 
        printf("High Capacity: %s\n", mmc->high_capacity ? "Yes" : "No");
        puts("Capacity: ");
@@ -106,7 +110,11 @@ static void print_mmcinfo(struct mmc *mmc)
                print_size(((u64)mmc->hc_wp_grp_size) << 9, "\n");
 
                puts("User Capacity: ");
-               print_size(mmc->capacity_user, usr_enh ? " ENH\n" : "\n");
+               print_size(mmc->capacity_user, usr_enh ? " ENH" : "");
+               if (mmc->wr_rel_set & EXT_CSD_WR_DATA_REL_USR)
+                       puts(" WRREL\n");
+               else
+                       putc('\n');
                if (usr_enh) {
                        puts("User Enhanced Start: ");
                        print_size(mmc->enh_user_start, "\n");
@@ -124,7 +132,11 @@ static void print_mmcinfo(struct mmc *mmc)
                        if (mmc->capacity_gp[i]) {
                                printf("GP%i Capacity: ", i+1);
                                print_size(mmc->capacity_gp[i],
-                                          is_enh ? " ENH\n" : "\n");
+                                          is_enh ? " ENH" : "");
+                               if (mmc->wr_rel_set & EXT_CSD_WR_DATA_REL_GP(i))
+                                       puts(" WRREL\n");
+                               else
+                                       putc('\n');
                        }
                }
        }