openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: gadget: udc: atmel: use of_find_matching_node_and_match 

Instead of trying to match every possible compatible use
of_find_matching_node_and_match() and pass the compatible array.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
Claudiu Beznea 2020-07-23 21:48:57 +03:00 committed by Felipe Balbi
parent e1c08cf231
commit 3a48217854
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/gadget/udc/atmel_usba_udc.c
View File

@ -2112,11 +2112,19 @@ static const struct of_device_id atmel_udc_dt_ids[] = {
MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids); MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids);
static const struct of_device_id atmel_pmc_dt_ids[] = {
{ .compatible = "atmel,at91sam9g45-pmc" },
{ .compatible = "atmel,at91sam9rl-pmc" },
{ .compatible = "atmel,at91sam9x5-pmc" },
{ /* sentinel */ }
};
static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
struct usba_udc *udc) struct usba_udc *udc)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct of_device_id *match; const struct of_device_id *match;
struct device_node *pp;
int i, ret; int i, ret;
struct usba_ep *eps, *ep; struct usba_ep *eps, *ep;
const struct usba_udc_config *udc_config; const struct usba_udc_config *udc_config;
@ -2127,13 +2135,17 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
udc_config = match->data; udc_config = match->data;
udc->errata = udc_config->errata; udc->errata = udc_config->errata;
udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc"); if (udc->errata) {
if (IS_ERR(udc->pmc)) pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,
udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc"); NULL);
if (IS_ERR(udc->pmc)) if (!pp)
udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc"); return ERR_PTR(-ENODEV);
if (udc->errata && IS_ERR(udc->pmc))
return ERR_CAST(udc->pmc); udc->pmc = syscon_node_to_regmap(pp);
of_node_put(pp);
if (IS_ERR(udc->pmc))
return ERR_CAST(udc->pmc);
}
udc->num_ep = 0; udc->num_ep = 0;