From patchwork Mon Oct 15 21:31:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 10642491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36C4F15E2 for ; Mon, 15 Oct 2018 21:32:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24F2B2A136 for ; Mon, 15 Oct 2018 21:32:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1861A2A138; Mon, 15 Oct 2018 21:32:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B9762A136 for ; Mon, 15 Oct 2018 21:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=awXFx+78WfLtsHBkaBcl35sTJXvAbUmVUcT9QnyR+SY=; b=fxF9o7U7xESXzl Ce8NG/v9QkE1VCckvfl99Su5KX3eI4Uzf71LA6bBG2smiRHgv5MGO9dwqu84aY74eFbqY8FJun4kz YV3O6IebabrTpy+qKIP4YRFvW8X5y8cV9WbNu+60TVJut+W9aRgdYD8ORm9V2Q9pe5lTKemz+tn/y EBmZDubMp5Zl2ZxLtqmUCD5vfpRugsecBjO3y8Fm+pP6FK12XrSGRBPj3bTkyboTWvY1PZKQqvQwf SofVwUtOO5dFDeY0JUy6r9tIP25GmxTK69FQUOQBfDO26x30mOvYEFXTnYkt5SdWNOjW3FODXAWNS DR4KJSPhV3K0fLv4sPKA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCAT7-00076H-FI; Mon, 15 Oct 2018 21:32:05 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCAT3-00074x-Ce for linux-arm-kernel@lists.infradead.org; Mon, 15 Oct 2018 21:32:03 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id D7528207C4; Mon, 15 Oct 2018 23:31:46 +0200 (CEST) Received: from localhost (unknown [88.191.26.124]) by mail.bootlin.com (Postfix) with ESMTPSA id AFE7E20731; Mon, 15 Oct 2018 23:31:46 +0200 (CEST) From: Alexandre Belloni To: Greg Kroah-Hartman , Felipe Balbi Subject: [PATCH RESEND] usb: gadget: udc: atmel: handle at91sam9rl PMC Date: Mon, 15 Oct 2018 23:31:41 +0200 Message-Id: <20181015213141.6699-1-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181015_143201_566973_0AEF7578 X-CRM114-Status: GOOD ( 10.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The at91sam9rl PMC is not quite the same as the at91sam9g45 one and now has its own compatible string. Add support for that. Fixes: 217bace8e548 ("ARM: dts: fix PMC compatible") Signed-off-by: Alexandre Belloni Acked-by: Cristian Birsan --- Hello Greg, This is an urgent fix that was sent on sep. 10. Can you please assist? drivers/usb/gadget/udc/atmel_usba_udc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 17147b8c771e..8f267be1745d 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -2017,6 +2017,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, 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))