From patchwork Fri Sep 12 11:10:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4893911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 145419F40F for ; Fri, 12 Sep 2014 11:08:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5098A202AE for ; Fri, 12 Sep 2014 11:13:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2B5520266 for ; Fri, 12 Sep 2014 11:13:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSOkM-00054a-5Z; Fri, 12 Sep 2014 11:10:34 +0000 Received: from cpsmtpb-ews01.kpnxchange.com ([213.75.39.4]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSOkI-0004yC-Cx for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2014 11:10:31 +0000 Received: from cpsps-ews11.kpnxchange.com ([10.94.84.178]) by cpsmtpb-ews01.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 12 Sep 2014 13:10:06 +0200 Received: from CPSMTPM-TLF101.kpnxchange.com ([195.121.3.4]) by cpsps-ews11.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 12 Sep 2014 13:10:06 +0200 Received: from [192.168.10.102] ([77.173.140.92]) by CPSMTPM-TLF101.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 12 Sep 2014 13:10:05 +0200 Message-ID: <1410520205.31130.33.camel@x220> Subject: [PATCH v3] ARM: mvebu: rename ARM_ERRATA_753970 From: Paul Bolle To: Jason Cooper , Andrew Lunn , Russell King , Gregory Clement , Sebastian Hesselbarth Date: Fri, 12 Sep 2014 13:10:05 +0200 In-Reply-To: <1403516086.12982.35.camel@x220> References: <201404052101.19381.arnd@arndb.de> <201404052104.11363.arnd@arndb.de> <1396777049.30640.9.camel@x220> <53418889.2050002@free-electrons.com> <1396805315.7723.8.camel@x220> <1401094871.25902.20.camel@x220> <20140620202100.GG21711@titan.lakedaemon.net> <20140620205340.GX32514@n2100.arm.linux.org.uk> <1403514104.12982.20.camel@x220> <20140623090714.GH32514@n2100.arm.linux.org.uk> <1403516086.12982.35.camel@x220> X-Mailer: Evolution 3.10.4 (3.10.4-3.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 12 Sep 2014 11:10:05.0981 (UTC) FILETIME=[1B8114D0:01CFCE7A] X-RcptDomain: lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140912_041030_766998_B33B587D X-CRM114-Status: GOOD ( 10.00 ) X-Spam-Score: -0.0 (/) Cc: Thomas Petazzoni , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds"). Two selects were added in v3.15 that still use the previous name. Rename these. Make these select statements depend on CACHE_L2X0, like all other select statements for PL310_ERRATA_753970 do, to be safe we don't inadvertently start to allow pointless configurations in the future. Signed-off-by: Paul Bolle --- v3: add CACHE_L2X0 dependency, as Russell requested. Tested with "git grep" and fiddling with "make ARCH=arm [...]config". Please shout if that's deemed insufficient. Note that I promised this v3 over two months ago. Taking two months to update this patch is not really something to be proud of. On the other hand: no one bothered to prod me for this v3 or send in a proper fix themselves. Add to this that I first reported these selects for an outdated Kconfig symbol in April. So I begin to wonder whether these selects statements are really needed to begin with. arch/arm/mach-mvebu/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index c1e4567a5ab3..101de7c3e7b3 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -37,7 +37,7 @@ config MACH_ARMADA_370 config MACH_ARMADA_375 bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 if CACHE_L2X0 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU @@ -52,7 +52,7 @@ config MACH_ARMADA_375 config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 if CACHE_L2X0 select ARM_GIC select ARMADA_38X_CLK select HAVE_ARM_SCU