linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: <Claudiu.Beznea@microchip.com>
To: <Cristian.Birsan@microchip.com>, <balbi@kernel.org>,
	<gregkh@linuxfoundation.org>, <Nicolas.Ferre@microchip.com>,
	<alexandre.belloni@bootlin.com>,
	<Ludovic.Desroches@microchip.com>, <robh+dt@kernel.org>,
	<mark.rutland@arm.com>, <linux-arm-kernel@lists.infradead.org>,
	<linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 1/6] usb: gadget: udc: atmel: use of_find_matching_node_and_match
Date: Thu, 23 Jul 2020 16:28:53 +0000	[thread overview]
Message-ID: <b9c051ce-fba2-297e-e6ec-63acfcc47afc@microchip.com> (raw)
In-Reply-To: <9cf8e546-09ce-d902-6dca-e2490fd8c4ae@microchip.com>



On 22.07.2020 17:43, Claudiu.Beznea@microchip.com wrote:
> 
> 
> On 22.07.2020 16:44, cristian.birsan@microchip.com wrote:
>> From: Claudiu Beznea <claudiu.beznea@microchip.com>
>>
>> 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>
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 25 ++++++++++++++++++-------
>>  1 file changed, 18 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index c5128c229c52..ee2b550aa400 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -2112,6 +2112,13 @@ 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)
>>  {
>> @@ -2128,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 (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);
>> +	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))
>> +			return ERR_CAST(udc->pmc);
>> +	}
> 
> This seems a bit not similar. I may had been wrong at the moment I wrote
> this patch. Probably the best would be:
> 
> +	udc->pmc = ERR_PTR(-ENODEV);
> +	pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,
> +					     NULL);
> +	if (pp) {
> +		udc->pmc = syscon_node_to_regmap(pp);
> +		of_node_put(pp);
> +	}
> +
> +	if ((!pp || IS_ERR(udc->pmc)) && udc->errata)
> +		return ERR_CAST(udc->pmc);

Actually, the initial patch should be good and simpler than what I proposed
in previous email. Please ignore it.

Sorry for the noise!

> 
> Thank you,
> Claudiu Beznea
> 
>>  
>>  	udc->num_ep = 0;
>>  
>>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2020-07-23 16:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 13:44 [PATCH v3 0/6] usb: gadget: udc: atmel: add usb device support for SAM9x60 SoC cristian.birsan
2020-07-22 13:44 ` [PATCH v3 1/6] usb: gadget: udc: atmel: use of_find_matching_node_and_match cristian.birsan
2020-07-22 14:43   ` Claudiu.Beznea
2020-07-23 16:28     ` Claudiu.Beznea [this message]
2020-07-23 16:33       ` Cristian.Birsan
2020-07-22 13:44 ` [PATCH v3 2/6] dt-bindings: usb: atmel: Update DT bindings documentation for sam9x60 cristian.birsan
2020-07-22 13:44 ` [PATCH v3 3/6] usb: gadget: udc: atmel: simplify endpoint allocation cristian.birsan
2020-07-22 13:44 ` [PATCH v3 4/6] usb: gadget: udc: atmel: use 1 bank endpoints for control transfers cristian.birsan
2020-07-22 13:44 ` [PATCH v3 5/6] usb: gadget: udc: atmel: update endpoint allocation for sam9x60 cristian.birsan
2020-07-22 13:44 ` [PATCH v3 6/6] ARM: dts: at91: sam9x60ek: enable usb device cristian.birsan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b9c051ce-fba2-297e-e6ec-63acfcc47afc@microchip.com \
    --to=claudiu.beznea@microchip.com \
    --cc=Cristian.Birsan@microchip.com \
    --cc=Ludovic.Desroches@microchip.com \
    --cc=Nicolas.Ferre@microchip.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=balbi@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).