From patchwork Wed Mar 31 10:58:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12175235 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 2691EC433C1 for ; Wed, 31 Mar 2021 11:03:09 +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 7E3B161990 for ; Wed, 31 Mar 2021 11:03:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E3B161990 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=FzGlc6CYQafgQ0o9fBIfB8REjGrw2cYW/auiUsJu86A=; b=SKdoDiitw1ikyyIuanJiLCI+X WTBHAtPI3AITBaIOlgzqBBH2RDQouZwug2gm7GGjXyDs6XjyuzBr7L4GbbRaBnu+4Qa9QBTr0jfjW 9NGfglFJfzvvyNc6YqlfMsfOMPJvF0R7Kv20pN4YKiJjAO1sZfSKd16VxrjINgyZI9X+fLODPS5g5 +CezlMNKt9BcMi4JSPeVecCtEu7fs6rCCTPnLzM+WJGygRypB4jMwC8tAxTbtlnFChisbvNUsibXy XI++rVNX4cx7wEFWsgigXGfvnUD4kwRUjmNagylR5Qs101rlfeoBLX3BQ5wW2EmRysY5hR1zFK7JT g3lVUmPkQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRYal-006JeZ-1M; Wed, 31 Mar 2021 11:00:59 +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 1lRYZT-006JMJ-99 for linux-arm-kernel@lists.infradead.org; Wed, 31 Mar 2021 10:59:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1617188374; x=1648724374; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gaczm4jYujlw82qtS4a93aXK/+MgYExxVmBklBssBb0=; b=fVFW4Pet5nnerBbQsSWZajDep977F18FsDmmfF4jk7Ot0t+lT5f02Sa1 zX/KmXP7iY1FSFbNNG3TBwNNLSNI8fpcqL4kD3nHBmneE4C3grC6+27+Q DhmvI26Nx7PxAqXihrVSiqNSRyfZvADRPJxL1pZWle6JV+uPPjTV9HcyU hL85D0zpel3s3PQXzAajEbSxfpjc93JiaDNRttYRrDMqZistvJBUPBVod ECCPuTgkseOgkPxUrNc/MhCKPvNxHAhkuXkF25AtsIpZJi8RC+omUluxw Oveyd0yJXCm67BhLoNjGJeRNKnKY5sysvAaD5wIemsD50Z9LBuLWWuScV A==; IronPort-SDR: wHNZi9re5DUG4FOk2n6mh8ke6BbKa2t1/VynAJLeGX6pkEaYNeIr/OWWQKuSLaAaJ+ckezWUsT nWw6HF+oKPoT5lR8KYRu8or3Xza/m+2sinVFyNocmf5YSZaAoskROi64wvl+bJ4VUnbZz6ouZ1 TA1h6mRUnldfDJ3CLC9UrnrKpPzbdDgoZZopbErJANVXLGAcyY1TFHEDHOCg81dYFje+p6SIWH IfLOWhqSaZVbVtS49TbXSppg9a7bv7KwdSsYuoApNOlGt65OrB/viUL0l0sH0CEuWA0l3lD+yH HkE= X-IronPort-AV: E=Sophos;i="5.81,293,1610434800"; d="scan'208";a="121233923" 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:33 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) 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.2176.2; Wed, 31 Mar 2021 03:59:32 -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:30 -0700 From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH 08/24] ARM: at91: pm: s/CONFIG_SOC_SAM9X60/CONFIG_HAVE_AT91_SAM9X60_PLL/g Date: Wed, 31 Mar 2021 13:58:52 +0300 Message-ID: <20210331105908.23027-9-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_115935_750678_C49CBFB5 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. 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 Replace CONFIG_SOC_SAM9X60 with CONFIG_HAVE_AT91_SAM9X60_PLL as the SAM9X60's PLL is also present on SAMA7G5. Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm_suspend.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index 960ad29cce51..1f63bbfad728 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -422,7 +422,7 @@ sr_dis_exit: cmp tmp1, #AT91_PMC_V1 beq 1f -#ifdef CONFIG_SOC_SAM9X60 +#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL /* Save PLLA settings. */ ldr tmp2, [pmc, #AT91_PMC_PLL_UPDT] bic tmp2, tmp2, #AT91_PMC_PLL_UPDT_ID @@ -489,7 +489,7 @@ sr_dis_exit: cmp tmp3, #AT91_PMC_V1 beq 4f -#ifdef CONFIG_SOC_SAM9X60 +#ifdef CONFIG_HAVE_AT91_SAM9X60_PLL /* step 1. */ ldr tmp1, [pmc, #AT91_PMC_PLL_UPDT] bic tmp1, tmp1, #AT91_PMC_PLL_UPDT_ID