Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp170605imd; Wed, 31 Oct 2018 16:44:39 -0700 (PDT) X-Google-Smtp-Source: AJdET5fcAPq8T+8XFmW9HBoHddsKPuVGwb6FIcq1CpZ/hOOcR0KfOFt5XvPufux2H+/F/hVElmg4 X-Received: by 2002:a17:902:e8:: with SMTP id a95-v6mr5390418pla.7.1541029479816; Wed, 31 Oct 2018 16:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541029479; cv=none; d=google.com; s=arc-20160816; b=VAQMGUFFdjM7L2E/b3+s27BuHx0uS7p55CnvoOQHvobmD1qoEW3Utjd4b8ruTY3cvv 2iuuJOofVp0QTaYLYWuSibLXz7xC5gFoeGpOCJaMFoi8Nxpe/9w6ra6j8/WrLRIkHUsy u0i8H0TrmyrohSXHkqSBHM8zGI/RuYC/lJ7CUsXvkSDbd+l7+pgKVRcSa0Zpu3B31IZT ysz2ZNyVlJBx4ObWdwfS57ytkWK3lMdFi3JpJZOYLA3O/KEUbtX4vj08SNp4cvZyps/E u8IcgRnXKOr7Qv2NNdR3EZSBroJw72mvOz6HLEsg9pAf6J8eihakaZRy9A3lv0EZ87+t wRdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=YlnOsUZ1M0xv1N6J6XdKml/sq7ATvC7fWuk3/kMqagw=; b=bgHZ9TZ7JQPNflWddsWCpwpTVWjT4li3OhKi+FxIyiLmgj1avyCoNNIl6TdyD4V3x2 iRErcYxXldRyj2S0y5uTUkYBU7Z7iUbUfbQMsJDJ4UKvbXTTsR28kvF4mRW/GcMZFoYG KDH8eq41tCzUIDQpkrqhybAWMFdId0UKTBEk1XGqQktVUTJR9Jx1qLh4a6fTRg378JJg mSU/yHXa/d4RRlF3CIjQxcTL3wteKVSVJ8sWdXtijrnxMZNIVzMG1xkz0vAqdcxuS78N 77fCTcOeHlfybXXiaG2PuJtdn2tzKeBPS4rrYR3LES1nAbXhtYq3vfI+BL+1+tUQY+pW sW4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SoFCxxbN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o4-v6si7677793pgj.306.2018.10.31.16.44.24; Wed, 31 Oct 2018 16:44:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SoFCxxbN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729035AbeKAIHi (ORCPT + 99 others); Thu, 1 Nov 2018 04:07:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:55554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729010AbeKAIHh (ORCPT ); Thu, 1 Nov 2018 04:07:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B49B2081B; Wed, 31 Oct 2018 23:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541027247; bh=F3HpubOcYNPNMapyXwlA/Yc8C8eC9mDgmj7KXkIT62w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SoFCxxbNRYgOF/p9Kp3vNKHbnwTIOLYzd2Ic4khajX39SBQ9YHMMr/OS8bl51lnId /wp3nDEAqQhyoV0zsHoUaOoWrjwzO3+BRuA4aQxwZf4eQaVBznsMNRzV3fwSc2A7zf JPLrL4cMvODTSotTGZvkjpLfiLhZ91nadpI+xjEc= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Felipe Balbi , Sasha Levin Subject: [PATCH AUTOSEL 4.19 116/146] usb: gadget: udc: atmel: handle at91sam9rl PMC Date: Wed, 31 Oct 2018 19:05:11 -0400 Message-Id: <20181031230541.28822-116-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031230541.28822-1-sashal@kernel.org> References: <20181031230541.28822-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexandre Belloni [ Upstream commit bb80e4fa57eb75ebd64ae9be4155da6d12c1a997 ] 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") Acked-by: Cristian Birsan Signed-off-by: Alexandre Belloni Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- 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)) -- 2.17.1