1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 49d9dcaeca4..7cd9749dc21 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -37,6 +37,8 @@ static ssize_t mmc_type_show(struct device *dev,
                 return sprintf(buf, "SD\n");
         case MMC_TYPE_SDIO:
                 return sprintf(buf, "SDIO\n");
+        case MMC_TYPE_SD_COMBO:
+                return sprintf(buf, "SDcombo\n");
         default:
                 return -EFAULT;
         }
@@ -74,6 +76,9 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
         case MMC_TYPE_SDIO:
                 type = "SDIO";
                 break;
+        case MMC_TYPE_SD_COMBO:
+                type = "SDcombo";
+                break;
         default:
                 type = NULL;
         }
@@ -239,6 +244,10 @@ int mmc_add_card(struct mmc_card *card)
         case MMC_TYPE_SDIO:
                 type = "SDIO";
                 break;
+        case MMC_TYPE_SD_COMBO:
+                type = "SD-combo";
+                if (mmc_card_blockaddr(card))
+                        type = "SDHC-combo";
         default:
                 type = "?";
                 break;