From: <cristian.birsan@microchip.com>
To: <balbi@kernel.org>, <gregkh@linuxfoundation.org>,
<nicolas.ferre@microchip.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <alexandre.belloni@bootlin.com>,
<ludovic.desroches@microchip.com>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: [PATCH 1/7] usb: gadget: udc: atmel: use of_find_matching_node_and_match
Date: Tue, 7 Apr 2020 15:28:46 +0300 [thread overview]
Message-ID: <20200407122852.19422-2-cristian.birsan@microchip.com> (raw)
In-Reply-To: <20200407122852.19422-1-cristian.birsan@microchip.com>
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 | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 6e0432141c40..32e5b44d9fbd 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -2052,6 +2052,12 @@ 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" },
+};
+
static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
struct usba_udc *udc)
{
@@ -2067,13 +2073,17 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
return ERR_PTR(-EINVAL);
udc->errata = match->data;
- 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);
+ }
udc->num_ep = 0;
--
2.17.1
next prev parent reply other threads:[~2020-04-07 12:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 12:28 [PATCH 0/7] usb: gadget: udc: atmel: add usb device support for SAM9x60 SoC cristian.birsan
2020-04-07 12:28 ` cristian.birsan [this message]
2020-04-07 12:28 ` [PATCH 2/7] usb: gadget: udc: atmel: add compatible for SAM9X60's PMC cristian.birsan
2020-04-07 13:41 ` Alexandre Belloni
2020-04-07 14:04 ` Cristian.Birsan
2020-04-07 12:28 ` [PATCH 3/7] usb: gadget: at91_udc: Update DT binding documentation cristian.birsan
2020-04-07 13:45 ` Alexandre Belloni
2020-04-07 13:59 ` Cristian.Birsan
2020-04-07 14:04 ` Alexandre Belloni
2020-04-07 12:28 ` [PATCH 4/7] usb: gadget: udc: atmel: simplify endpoint allocation cristian.birsan
2020-04-07 12:28 ` [PATCH 5/7] usb: gadget: udc: atmel: use 1 bank endpoints for control transfers cristian.birsan
2020-04-07 12:28 ` [PATCH 6/7] usb: gadget: udc: atmel: rename errata into caps cristian.birsan
2020-04-07 13:48 ` Alexandre Belloni
2020-04-07 12:28 ` [PATCH 7/7] usb: gadget: udc: atmel: update endpoint allocation for sam9x60 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=20200407122852.19422-2-cristian.birsan@microchip.com \
--to=cristian.birsan@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=balbi@kernel.org \
--cc=claudiu.beznea@microchip.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=nicolas.ferre@microchip.com \
/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
all inboxes | Powered by JetHome®