From patchwork Tue Feb 11 21:11:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 3632921 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 E26F29F334 for ; Tue, 11 Feb 2014 21:16:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBAED2012B for ; Tue, 11 Feb 2014 21:16:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 F108A20127 for ; Tue, 11 Feb 2014 21:16:33 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDKf9-0004B9-UX; Tue, 11 Feb 2014 21:14:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDKel-0004tj-U5; Tue, 11 Feb 2014 21:14:15 +0000 Received: from mail-ob0-x230.google.com ([2607:f8b0:4003:c01::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDKdI-0004k0-4Q for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2014 21:12:51 +0000 Received: by mail-ob0-f176.google.com with SMTP id gq1so9411198obb.21 for ; Tue, 11 Feb 2014 13:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xaxN/jMtqtj1FSzqflB2N/wFATLJ9SCsKRbc+XdGQkE=; b=dc+5dXYK4QqEXJa89DtKlwT4A3tgK0wPIsT4igwXxrbGWkTvjuz+28mN1YiL5YMcDV pSkITQjjLusFrw2KAKK5ISsZTqDrbPkkmHIQYhvlQOmobIfNxGZMaz/kM6vW552YGOb7 BiQv8T5/IKaqG5fzkjA+AGtecebFCl7Qvue3iNTvTNyYeDoTUd2rn7YBK73loN3ss5c7 B8bZXrGo1IXsvV+h09nWXOyGyU5Drxh8NNL4Ze2CuPOv63lS4GkUndcVuGtlXwko+vSJ GMLecPdEKYNclroPFum45f8Ey6abemRT59cvBWgwZVKEJuC8k9vzdyb5hY8J3UeCOL0t LtxQ== X-Received: by 10.182.223.114 with SMTP id qt18mr2080264obc.61.1392153142844; Tue, 11 Feb 2014 13:12:22 -0800 (PST) Received: from localhost.localdomain (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPSA id tr10sm47092913obb.6.2014.02.11.13.12.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 13:12:22 -0800 (PST) From: Rob Herring To: arm@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/9] ARM: Select V6K instead of V6 by default for multi-platform Date: Tue, 11 Feb 2014 15:11:54 -0600 Message-Id: <1392153119-23248-5-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392153119-23248-1-git-send-email-robherring2@gmail.com> References: <1392153119-23248-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140211_161244_468553_E33B782E X-CRM114-Status: GOOD ( 12.02 ) X-Spam-Score: 1.3 (+) Cc: Rob Herring , Stephen Warren , marc.zyngier@arm.com, Linus Walleij , Anton Vorontsov , will.deacon@arm.com, Sascha Hauer , Jamie Iles , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no 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 From: Rob Herring MULTI_V6 should default to V6K as it is more optimal than V6. Any platform which is not V6K should select CPU_V6 which will enable the less optimal code paths. Signed-off-by: Rob Herring Cc: Anton Vorontsov Cc: Shawn Guo Cc: Sascha Hauer Cc: Jamie Iles Acked-by: Shawn Guo --- arch/arm/Kconfig | 2 +- arch/arm/mach-cns3xxx/Kconfig | 2 +- arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-picoxcell/Kconfig | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7560be4..f350ca5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -910,7 +910,7 @@ config ARCH_MULTI_V4_V5 config ARCH_MULTI_V6 bool "ARMv6 based platforms (ARM11)" select ARCH_MULTI_V6_V7 - select CPU_V6 + select CPU_V6K config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index c6f58a1..b16b29a 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig @@ -1,9 +1,9 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC - select CPU_V6K select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select CPU_V6 help Support for Cavium Networks CNS3XXX platform. diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ff24473..41ffd43 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -114,7 +114,6 @@ config SOC_IMX31 config SOC_IMX35 bool select ARCH_MXC_IOMUX_V3 - select CPU_V6K select HAVE_EPIT select MXC_AVIC select SMP_ON_UP if SMP diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig index c88ff74..eca9eb1 100644 --- a/arch/arm/mach-picoxcell/Kconfig +++ b/arch/arm/mach-picoxcell/Kconfig @@ -2,7 +2,6 @@ config ARCH_PICOXCELL bool "Picochip PicoXcell" if ARCH_MULTI_V6 select ARCH_REQUIRE_GPIOLIB select ARM_VIC - select CPU_V6K select DW_APB_TIMER_OF select HAVE_TCM select NO_IOPORT