Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1556450ybh; Thu, 23 Jul 2020 11:49:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySLrxIOuK14NQxr/ssTk04k0gRCz175U3FPGILNP+cQjke0Ib4lA014CnkQBmS/dc1tWP+ X-Received: by 2002:a17:906:46d1:: with SMTP id k17mr5634187ejs.446.1595530196471; Thu, 23 Jul 2020 11:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595530196; cv=none; d=google.com; s=arc-20160816; b=G9z+SyDcJhFfDIdxfOZD4wuSj+XnQ2HGn50g/oFsirVJ8qxksKuWTW+OcxJR5XnZMQ ncKIuH9N4KNNzryZcMefG9YIlBhvh/tuC5GUX3c5ig0mtgZM4igHNeVcEIoN/tEpPYZS mO2qxu6qH8nFVK2yKabAVxCHmK2q8+9CN2TMsQ1W6xK0nIsL80NvP9bJsP9Ts9LfV3jT 3FPVoNbJnnOotWQMD9aeC91L2xshWooafizuJWa+XUZf++F+1UszgL5dz9bQAQpvekEc QaVYC3pcg7Ss6XweVfUlatN4zVkIPvfDjqGyPcOg3QM9szXHxR8JpPn8EsftyopIiGow w+Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:dkim-signature; bh=FlblMyW2JqPI6aC66UOMBXlE3qRYKiw311X80+5ALLI=; b=jLJa7uCtfKR+MaYKfoIoO0iHTVBIywUHAa/KtzgsAXxUs0xd+w9utXNa4GjIuPvC/b 7drWOjMc+OhMfViAkd8XRqEkKdIxI8DclIRPu/xhOKx3I+Hf2j3v6AVNz9pj27CtYj6+ nrD+nLn7deVK2lKkSwiXCIfVDsAURb/LKn4Jr/gFhLYwFau2pSLRt4jh/62BfwS8wIHc 5p7F700pe/UB982j8JFxGkN7kAKHNd4Wgy8ISlUMf0W248tQj5Q6RXclibOW19/3tsYv 8DZ5f0tRWdO42g12ZBWP7IGHwcDIYlHhqesl56mBNcbeEPnnD8mX8kRtHKmqm3yJAhCp xDgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=JZOtQsNw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l10si2382482ejh.673.2020.07.23.11.49.34; Thu, 23 Jul 2020 11:49:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=JZOtQsNw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728145AbgGWStR (ORCPT + 99 others); Thu, 23 Jul 2020 14:49:17 -0400 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:10065 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726349AbgGWStQ (ORCPT ); Thu, 23 Jul 2020 14:49:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1595530155; x=1627066155; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OP/6x1FWBOWYFD0Vizy3q/OtdHKjms+2XnvxpxgJNsU=; b=JZOtQsNwOr302K4pVrdRALCpGruzDTw5bPLTwp2wnE/lf4qc5EzQUR2G mRQbBSbXPb4YeDn3vREG6sZssgmiM/Q3vvqQrSvMWkdotG0Bi36gSxYsr qeT9fb5OF4boAA22Ey/CT1s21lN7fOVZtLCzHMLVBWxYsEtHC+nnn9PLO 1EI/oW61SxulnhaR1tFenYLVTdmEaUTgtlU22RqFisxBMtRf2nPyVhnar NDIgXcrx2C00fsLxn1gnj89toODJbC/E7POCzqGs03nARfBa04ub00Cvw mcTh4RYRZBwAaTF2jo5PIN/FdiqPVkFC3MXw8HT1PyTjeodlXCeFP/Ux3 Q==; IronPort-SDR: sapuqCwlsZIVzl004MwFqSN4O56pfFH31ChOcjpIggQrPyfV+d2c9nkyaNlp3kYvggHpVRuIHu 4mIAUUnt2NJUWCgYvmyU3ibOiN+na9VLgnLWkeLIPSh2YfFyZYFcQ3mpgdfLCYFBDZWx+4zdCf WBJnohVFfP8J2QgWK57owwaqCoHnkaXPDJF9BTqCWbRRucYv2tValNG0KmMiWckxG3zvlmMytK dn9zF0GeUDxN4CFh5bpP9Dyd6cZC24DzFhV7XKwOWQ848RtlqT8GY0uLxM+wXZvuZTq0aNX8qU vjo= X-IronPort-AV: E=Sophos;i="5.75,387,1589266800"; d="scan'208";a="20343895" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 23 Jul 2020 11:49:14 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 23 Jul 2020 11:49:15 -0700 Received: from cristi-P53.lan (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Thu, 23 Jul 2020 11:48:32 -0700 From: To: , , , , , , , , , , CC: Claudiu Beznea Subject: [PATCH v4 1/6] usb: gadget: udc: atmel: use of_find_matching_node_and_match Date: Thu, 23 Jul 2020 21:48:57 +0300 Message-ID: <20200723184902.416705-2-cristian.birsan@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723184902.416705-1-cristian.birsan@microchip.com> References: <20200723184902.416705-1-cristian.birsan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Claudiu Beznea 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 Signed-off-by: Cristian Birsan --- drivers/usb/gadget/udc/atmel_usba_udc.c | 26 ++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index fa6793065c7c..4281242b5f9a 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -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 (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.25.1