summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Wang <frank.wang@rock-chips.com>2018-01-31 11:43:17 +0800
committerShirle Yuen <shirleyshukyee@google.com>2018-06-25 09:11:24 -0700
commitee747213d40cf0e81d6f9389cda8a3331945135d (patch)
treee8cc200b37cc23b1f24d8a7f8e6d6d1d0e0ab462
parentcdf70d4be5ff83a9c46d8c64a3a90e6c093d889f (diff)
downloadrk-u-boot-ee747213d40cf0e81d6f9389cda8a3331945135d.tar.gz
usb: gadget: amend flash type for rockusb
Add more flash type support for rockusb command. Change-Id: I8f2a2f6b5d1c3c5fb8824ce726cc3f0b6443d8ef Signed-off-by: Frank Wang <frank.wang@rock-chips.com> (cherry picked from commit a4862096640430b51a35f29e96cc5fbead8ea7d4)
-rw-r--r--drivers/usb/gadget/f_rockusb.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index a4e16034c1..40775d3ad7 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -138,8 +138,14 @@ static int rkusb_do_read_flash_id(struct fsg_common *common,
{
u8 *buf = (u8 *)bh->buf;
u32 len = common->data_size;
+ enum if_type type = ums[common->lun].block_dev.if_type;
- memcpy((void *)&buf[0], "EMMC ", 5);
+ if (type == IF_TYPE_MMC)
+ memcpy((void *)&buf[0], "EMMC ", 5);
+ else if (type == IF_TYPE_RKNAND)
+ memcpy((void *)&buf[0], "NAND ", 5);
+ else
+ memcpy((void *)&buf[0], "UNKN ", 5); /* unknown */
/* Set data xfer size */
common->residue = common->data_size_from_cmnd = len;