diff options
| author | Zhikang Zhang <zhikang.zhang@nxp.com> | 2017-08-03 02:30:56 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-13 15:17:30 -0400 |
| commit | ffab6945eca97c23612d8434833dcdaa4a8556dd (patch) | |
| tree | 7c4795a374066279193cdf1ff5796ac3391cc43c | |
| parent | 1b69ce2fc0ecd1741645d6084be45e562156b5ae (diff) | |
| download | u-boot-ffab6945eca97c23612d8434833dcdaa4a8556dd.tar.gz | |
dm: blk: part: Add UCLASS_NVME and IF_TYPE_NVME
This adds a new uclass id and block interface type for NVMe.
Signed-off-by: Zhikang Zhang <zhikang.zhang@nxp.com>
Signed-off-by: Wenbin Song <wenbin.song@nxp.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jon Nettleton <jon@solid-run.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | disk/part.c | 6 | ||||
| -rw-r--r-- | drivers/block/blk-uclass.c | 2 | ||||
| -rw-r--r-- | include/blk.h | 1 | ||||
| -rw-r--r-- | include/dm/uclass-id.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/disk/part.c b/disk/part.c index e640a55163..d76aa903a8 100644 --- a/disk/part.c +++ b/disk/part.c @@ -132,6 +132,7 @@ void dev_print (struct blk_desc *dev_desc) case IF_TYPE_SD: case IF_TYPE_MMC: case IF_TYPE_USB: + case IF_TYPE_NVME: printf ("Vendor: %s Rev: %s Prod: %s\n", dev_desc->vendor, dev_desc->revision, @@ -263,7 +264,10 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc) puts ("MMC"); break; case IF_TYPE_HOST: - puts("HOST"); + puts ("HOST"); + break; + case IF_TYPE_NVME: + puts ("NVMe"); break; default: puts ("UNKNOWN"); diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 23f131b7ad..a3737badec 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -22,6 +22,7 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_SATA] = "sata", [IF_TYPE_HOST] = "host", [IF_TYPE_SYSTEMACE] = "ace", + [IF_TYPE_NVME] = "nvme", }; static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { @@ -34,6 +35,7 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { [IF_TYPE_SD] = UCLASS_INVALID, [IF_TYPE_SATA] = UCLASS_AHCI, [IF_TYPE_HOST] = UCLASS_ROOT, + [IF_TYPE_NVME] = UCLASS_NVME, [IF_TYPE_SYSTEMACE] = UCLASS_INVALID, }; diff --git a/include/blk.h b/include/blk.h index 1e6239ac9e..61b56281b3 100644 --- a/include/blk.h +++ b/include/blk.h @@ -31,6 +31,7 @@ enum if_type { IF_TYPE_SATA, IF_TYPE_HOST, IF_TYPE_SYSTEMACE, + IF_TYPE_NVME, IF_TYPE_COUNT, /* Number of interface types */ }; diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 2e6498b7dc..1a501992db 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -52,6 +52,7 @@ enum uclass_id { UCLASS_MOD_EXP, /* RSA Mod Exp device */ UCLASS_MTD, /* Memory Technology Device (MTD) device */ UCLASS_NORTHBRIDGE, /* Intel Northbridge / SDRAM controller */ + UCLASS_NVME, /* NVM Express device */ UCLASS_PANEL, /* Display panel, such as an LCD */ UCLASS_PANEL_BACKLIGHT, /* Backlight controller for panel */ UCLASS_PCH, /* x86 platform controller hub */ |