mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-31 00:17:44 +00:00
Code Issues Releases Wiki Activity

usb: gadget: aspeed: allow to set usb strings in device tree

Browse source 
If "vhub,string-descriptor" device tree property is defined, the driver
will load string descriptors from device tree; otherwise, the default
string descriptors will be used.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
Tao Ren 2020-03-15 12:16:29 -07:00 committed by Felipe Balbi
parent 17309a6a43
commit 30d2617fd7
1 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
drivers/usb/gadget/udc/aspeed-vhub/hub.c
View file

@ -941,9 +941,61 @@ static int ast_vhub_str_alloc_add(struct ast_vhub *vhub,
return 0;
}
static const struct {
const char *name;
u8 id;
} str_id_map[] = {
{"manufacturer", AST_VHUB_STR_MANUF},
{"product", AST_VHUB_STR_PRODUCT},
{"serial-number", AST_VHUB_STR_SERIAL},
{},
};
static int ast_vhub_of_parse_str_desc(struct ast_vhub *vhub,
const struct device_node *desc_np)
{
u32 langid;
int ret = 0;
int i, offset;
const char *str;
struct device_node *child;
struct usb_string str_array[AST_VHUB_STR_INDEX_MAX];
struct usb_gadget_strings lang_str = {
.strings = (struct usb_string *)str_array,
};
for_each_child_of_node(desc_np, child) {
if (of_property_read_u32(child, "reg", &langid))
continue; /* no language identifier specified */
if (!usb_validate_langid(langid))
continue; /* invalid language identifier */
lang_str.language = langid;
for (i = offset = 0; str_id_map[i].name; i++) {
str = of_get_property(child, str_id_map[i].name, NULL);
if (str) {
str_array[offset].s = str;
str_array[offset].id = str_id_map[i].id;
offset++;
}
}
str_array[offset].id = 0;
str_array[offset].s = NULL;
ret = ast_vhub_str_alloc_add(vhub, &lang_str);
if (ret)
break;
}
return ret;
}
static int ast_vhub_init_desc(struct ast_vhub *vhub)
{
int ret;
struct device_node *desc_np;
const struct device_node *vhub_np = vhub->pdev->dev.of_node;
/* Initialize vhub Device Descriptor. */
memcpy(&vhub->vhub_dev_desc, &ast_vhub_dev_desc,
@ -960,7 +1012,11 @@ static int ast_vhub_init_desc(struct ast_vhub *vhub)
/* Initialize vhub String Descriptors. */
INIT_LIST_HEAD(&vhub->vhub_str_desc);
ret = ast_vhub_str_alloc_add(vhub, &ast_vhub_strings);
desc_np = of_get_child_by_name(vhub_np, "vhub-strings");
if (desc_np)
ret = ast_vhub_of_parse_str_desc(vhub, desc_np);
else
ret = ast_vhub_str_alloc_add(vhub, &ast_vhub_strings);
return ret;
}