Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp308622pxf; Wed, 31 Mar 2021 04:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMQyeNdo/QblcG+FyBNpBg1q3rKgV03XEHc+wqtHTwUZvniO6tZBtLsGFdS+soqtFVH4iU X-Received: by 2002:a17:907:76ed:: with SMTP id kg13mr2716499ejc.99.1617188522706; Wed, 31 Mar 2021 04:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617188522; cv=none; d=google.com; s=arc-20160816; b=tbX9/iNtvrRdSJ7EN8Ms8KfZx0HbdgvwMQR3r6f/ZFOkwuMIoizSZGXcDL0HxjltOJ P6D90l7sd+3tmG2c3O+XYDCbQRjc/97aFJy5HijLgVxgCLMH2WctZVU67qjZ2Kw1SPGQ Uz530RIIyH0MJvL9VJC42TGWxT70I26iFsO7NzHo9OlP7BC3l3gtYzaCqn6EXpkpb0W6 s7pyU5jSzCL4qgrZCOr/BEeh2d0nnlwALV1eK2e4b/1ZmNOTpGknacGnVYTBby4nGFYi FL/5h65QjKi6/tlSyiJAJIsoxZnfrgX4ZzVER/HWyUjXzf9Swj3RDquUt8aKu78G9Oz1 twgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:dkim-signature; bh=hgKxRBk/Phkb5bh3LiJI6qiJ1YZbxfA33yrfKajuLmQ=; b=iQMUmoRCMIy6VNS7rli04YILdDpg3WzrictHf4SXN8U5gHqu8j7sYo+ev7HDZsZcHS FGbFZ6Wg+0q3VjwgtvEe4sMTU6IK/2RfKEshqooEDWWWFHay1Ujwbx4SVhr1babi0VOG tHIpDIrfS8lPYMdug4oHdBDLxWiC70g+BCmmdozpOZsDP9yRTRnxQoMCSk9EMT5Cjzp5 nMmuFPBHunuX9l3nPt6twWEsvUVS1Iyh9lBv1vzJLX2DLTZn+1+5zP7Jgf30lir1GNLy 0DZEf6qeQjL2b6gz3fmfht+B+eSVGuV6EkI4EpyQCzBDoAz/zcul2Z6moXF6Xy68aZ1o 6E+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=V0lWviY7; 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 i22si1652145edc.112.2021.03.31.04.01.40; Wed, 31 Mar 2021 04:02:02 -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=V0lWviY7; 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 S235220AbhCaLAK (ORCPT + 99 others); Wed, 31 Mar 2021 07:00:10 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:43913 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234862AbhCaK7d (ORCPT ); Wed, 31 Mar 2021 06:59:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1617188373; x=1648724373; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gaczm4jYujlw82qtS4a93aXK/+MgYExxVmBklBssBb0=; b=V0lWviY7gi5um0JPXjkvWJIGY9J9Vbk+k3XFq+GvqP+GXrMzxS4hPByN 8vCC3XqlA4+fVC05xAes8YUwrjRd+XPdtU9BsoJIjrg9Vw+48w+Xzg3R1 jS8uW8vCJP1FjDG27IwHjIS2I42bgqC8KyIgFDyJ6HlSriCcz7jUDqOxe nNURz6Zqe/mcRaoRPQ977CGsv8h/Yfp1h7lIkUn2zaCZSu1m8T+1POkyN xL2Jn8M4VdDHeA3alRA2DT/RjDQ7PffADtXtQr4gH/98gxHNEWn0YYKm6 etztYPU9qGikGuMCFijTR+lUs5ghM9WBh/iFqjnteZ+gIvFOJjFXahtjr Q==; 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- 2.25.1