From patchwork Mon Jun 23 09:01:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4400881 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 A658F9F1D6 for ; Mon, 23 Jun 2014 09:05:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE40D201F5 for ; Mon, 23 Jun 2014 09:05:32 +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 0688D201F4 for ; Mon, 23 Jun 2014 09:05:32 +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 1Wz08m-0003zc-Nw; Mon, 23 Jun 2014 09:02:16 +0000 Received: from cpsmtpb-ews03.kpnxchange.com ([213.75.39.6]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wz08f-0003wZ-5O for linux-arm-kernel@lists.infradead.org; Mon, 23 Jun 2014 09:02:14 +0000 Received: from cpsps-ews15.kpnxchange.com ([10.94.84.182]) by cpsmtpb-ews03.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 23 Jun 2014 11:01:44 +0200 Received: from CPSMTPM-TLF103.kpnxchange.com ([195.121.3.6]) by cpsps-ews15.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 23 Jun 2014 11:01:44 +0200 Received: from [192.168.10.107] ([195.240.213.44]) by CPSMTPM-TLF103.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 23 Jun 2014 11:01:44 +0200 Message-ID: <1403514104.12982.20.camel@x220> Subject: [PATCH v2] ARM: mvebu: rename ARM_ERRATA_753970 From: Paul Bolle To: Jason Cooper , Andrew Lunn , Gregory CLEMENT , Sebastian Hesselbarth , ". Russell King - ARM Linux" Date: Mon, 23 Jun 2014 11:01:44 +0200 In-Reply-To: <20140620205340.GX32514@n2100.arm.linux.org.uk> 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> X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 23 Jun 2014 09:01:44.0605 (UTC) FILETIME=[C1AA9CD0:01CF8EC1] X-RcptDomain: lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140623_020209_547220_B0911882 X-CRM114-Status: GOOD ( 11.27 ) 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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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. Signed-off-by: Paul Bolle --- v2: redone on top of next-21040623, and therefor on top of commit a641f3a6abce ("ARM: l2c: fix dependencies on PL310 errata symbols"). Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be (indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set. Tested only with "make ARCH=arm menuconfig". So not compile tested! If that's not acceptable please let me know. (I have no access to these machines so runtime testing is not possible for me.) Perhaps we want something similar for v3.15+ stable. But that would require a different patch (v1 could probably be used for stable). 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 955d4a3afabd..8d4cf4fa118a 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -33,7 +33,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 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU @@ -48,7 +48,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 select ARM_GIC select ARMADA_38X_CLK select HAVE_ARM_SCU