Commit 3a482178 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Felipe Balbi
Browse files

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: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarCristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent e1c08cf2

drivers/usb/gadget/udc/atmel_usba_udc.c

+19 −7
Original line number Diff line number Diff line
@@ -2112,11 +2112,19 @@ static const struct of_device_id 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,

						    struct usba_udc *udc)

{

	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match;

	struct device_node *pp;

	int i, ret;

	struct usba_ep *eps, *ep;

	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->errata = udc_config->errata;

	udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");

	if (udc->errata) {

		pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,

						     NULL);

		if (!pp)

			return ERR_PTR(-ENODEV);



		udc->pmc = syscon_node_to_regmap(pp);

		of_node_put(pp);

		if (IS_ERR(udc->pmc))

		udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");

	if (IS_ERR(udc->pmc))

		udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");

	if (udc->errata && IS_ERR(udc->pmc))

			return ERR_CAST(udc->pmc);

	}



	udc->num_ep = 0;