From patchwork Fri Jul 8 06:00:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommy Lin X-Patchwork-Id: 956102 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p686Aux4018168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 8 Jul 2011 06:11:22 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf46w-0006zC-AK; Fri, 08 Jul 2011 06:00:22 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qf46v-0003bz-Qh; Fri, 08 Jul 2011 06:00:21 +0000 Received: from mail-iw0-f177.google.com ([209.85.214.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf46s-0003bh-In for linux-arm-kernel@lists.infradead.org; Fri, 08 Jul 2011 06:00:19 +0000 Received: by iwn35 with SMTP id 35so1764184iwn.36 for ; Thu, 07 Jul 2011 23:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=CbXpCedqmvZeqGIHMk2YzpWkI0SrPONoWeF71WWsWoo=; b=YPKEDzJBH5OdXAW2yWq1O0e8eQw4MztplzItvgapTETKieul0Nn+oTRP86gHmnmPo7 3hAcTFFF3BB1MO8Pxp6ednkxmUdR6OMhbZ8ZtNbMY0f/siX6p/aW1iNPsHZgbQiRCI/D JVS8AOOKDIgo19RIGvqV06a02UOvXuUFKhd9U= Received: by 10.42.134.2 with SMTP id j2mr1601953ict.308.1310104815631; Thu, 07 Jul 2011 23:00:15 -0700 (PDT) Received: from localhost.localdomain (60-250-205-192.HINET-IP.hinet.net [60.250.205.192]) by mx.google.com with ESMTPS id hp8sm10589441icc.23.2011.07.07.23.00.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Jul 2011 23:00:15 -0700 (PDT) From: Tommy Lin To: Russell King , linux-arm-kernel@lists.infradead.org, Anton Vorontsov Subject: [PATCH 2/2] arch: arm: CNS3xxx select the correct CPU type CPU_V6K Date: Fri, 8 Jul 2011 14:00:06 +0800 Message-Id: <1310104806-12984-1-git-send-email-tommy.lin@caviumnetworks.com> X-Mailer: git-send-email 1.7.0.4 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110708_020018_781977_B05DDA53 X-CRM114-Status: GOOD ( 12.23 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tommy.lin.1101[at]gmail.com) 0.1 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (tommy.lin.1101[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Tommy Lin , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 08 Jul 2011 06:11:22 +0000 (UTC) ARM11 -> CPU_V6 ARM11 MPCore -> CPU_V6K CNS3xxx has ARM11 MPCore CPUs (dual core), but initially select the same single core CPU type. To select MPCore watchdog support, this patch correts the CPU type from CPU_V6 to CPU_V6K. Signed-off-by: Tommy Lin --- arch/arm/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c148326..89eaab7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -321,7 +321,7 @@ config ARCH_CLPS711X config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" - select CPU_V6 + select CPU_V6K select GENERIC_CLOCKEVENTS select ARM_GIC select MIGHT_HAVE_PCI