From patchwork Wed Mar 31 10:59:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12175255 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3483C433C1 for ; Wed, 31 Mar 2021 11:06:28 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D65EF6187E for ; Wed, 31 Mar 2021 11:06:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D65EF6187E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cfO7CFvTK0L+UX5I7vXBAwy0JJEgR565GLPLNlrYgqA=; b=I5OczNrE+Tt7UIlvt48HdANxW cqH+JDZuPxlY5ETRc5bbetChAHiIxxwqK0a59tlxrRNBQMOqb/EgNJWJEfLCkXexzcVRSeSUZV1fz luflS7JJ626DrQdxQXkHreTj4YikISsSiHMEMXAHYZRZ71OYKOtJTwnQ4M5HhVukkJjVcJ61BnTBD bElA4dIDhsl+9AhEQGBloDnvrxSwD2Bg2eC50Aa0Iy4eMWIHSDnuFRYNOkgcP+Vg4Gw07HdcpZvoO jRxcUCm2vY1egALCrNOpfYQ3pYTIKics4+iJJFhuZ1rcjAxzbDp7IxbijWSccxTPZHS7l3VwxxMl7 g1kffEKYQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRYeD-006L3C-DH; Wed, 31 Mar 2021 11:04:32 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRYZq-006JQH-HO for linux-arm-kernel@lists.infradead.org; Wed, 31 Mar 2021 11:00:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1617188398; x=1648724398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7KxROLHftHxojszu7kto2DqA+KMwMJOPHCNZ1DYkUlo=; b=j1fDOmhRVwoh8Dk+NQoBcAmG65CFny/kcvfFOIlsx++0xUTsiLw5fWn1 f769vhuUtTTAeqFmnm2JXCJQwQDoJP2mmrgxAr2xFIvpGF5BvBE3FQexV 2wG08afLqJt334LmopbgdhoxRuQdkjjR1uBxkmzVJsIgG6VRAVip1gQWc fu3t5xtw1js+zoB0Fhbu8ft0dVCTqUqo+rH/bwz4hTc5Gr8lqqTYGLn1Q oP6+35wRjBmljYEbnLwO1tsP21k9sgQ8dc7bmPKnpkNR1kXoBwMbBffLm mDOw174I5egVNXX3DWcpkAjkfokw6LqQ/5V38QNXnFihgRGwiD+Da/zmt g==; IronPort-SDR: u3ELgjAP/MEeZkTpB4Z70bfo5M4KC5N6tbK6ZNipWI1c7Y2poxoIkQm6Z8y3ZIophMC+c2boc5 W6nxJ1PPAUI3X0u0YQno7ZIr0oMF7q5c5tANBRNj4pcSUCDesipARP6iFin038KQh6AJv15ML7 IynOhMDyYjpdjDQ3PYbYTBNQqNdxwBq1FN3KG4uZGb64yJ+97a29oQKJ62BTbo1REAVhxclUQB +Ekd3EoRiBkY7XfABF+pBY4BZmdnxYNMvIBHVeSES/g8DCndrwFynH/sPpyOfl1Qd4MOJKzyxT K50= X-IronPort-AV: E=Sophos;i="5.81,293,1610434800"; d="scan'208";a="121233973" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 31 Mar 2021 03:59:56 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 31 Mar 2021 03:59:56 -0700 Received: from rob-dk-mpu01.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Wed, 31 Mar 2021 03:59:54 -0700 From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH 17/24] ARM: at91: pm: add sama7g5 ddr controller Date: Wed, 31 Mar 2021 13:59:01 +0300 Message-ID: <20210331105908.23027-18-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210331105908.23027-1-claudiu.beznea@microchip.com> References: <20210331105908.23027-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210331_115959_075266_7109C494 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add SAMA7G5 DDR controller to the list of DDR controller compatibles. At the moment there is no standby support. Adapt the code for this. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 65e13769cf50..5dc942a2012d 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -548,6 +548,7 @@ static const struct of_device_id ramc_ids[] __initconst = { { .compatible = "atmel,at91sam9260-sdramc", .data = &ramc_infos[1] }, { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, { .compatible = "atmel,sama5d3-ddramc", .data = &ramc_infos[3] }, + { .compatible = "microchip,sama7g5-uddrc", }, { /*sentinel*/ } }; @@ -565,9 +566,11 @@ static __init void at91_dt_ramc(void) panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx); ramc = of_id->data; - if (!standby) - standby = ramc->idle; - soc_pm.data.memctrl = ramc->memctrl; + if (ramc) { + if (!standby) + standby = ramc->idle; + soc_pm.data.memctrl = ramc->memctrl; + } idx++; }