From patchwork Sat Feb 1 22:35:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 3565391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D8CFC02DC for ; Sat, 1 Feb 2014 22:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A971A202AE for ; Sat, 1 Feb 2014 22:37:52 +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 BABEF20295 for ; Sat, 1 Feb 2014 22:37:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9jB9-0002E4-Nl; Sat, 01 Feb 2014 22:36:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9jAv-0000Yf-NF; Sat, 01 Feb 2014 22:36:33 +0000 Received: from mail-ob0-x236.google.com ([2607:f8b0:4003:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9jAb-0000V3-Mk for linux-arm-kernel@lists.infradead.org; Sat, 01 Feb 2014 22:36:16 +0000 Received: by mail-ob0-f182.google.com with SMTP id wm4so6584193obc.27 for ; Sat, 01 Feb 2014 14:35:55 -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=1cOlba/bI/f07M006GLf8TLdIWJbzdMhk1N5vpqKcs0=; b=IS6z90JTlVuekSLO9HNvt7uEHqky7BYpMlXp57aB+idxXEUJ6kP/7urQ3+QDvP0Q4Q q4DAavzeoVJDwvexwazQGGbPo8HutJnfiPWpPEPKfaxzYDpxoPFK2YnVSOulgC3tP/hF gKQ6kUvKlE1HAnWEdixIzEOCNKB3n29XWnmjQOv9QI3aUbARLxqm079Ua2Adef4ARLoQ m4Ed8KP082Ld7my/cfC3alTj1FEAJ7AsilTE7kI0f30tsL5M0mJnORWiFlc5SkNVg4ii oDUdkwYmV2QbIQbkypzTHNmmYHs/LVpYGjhrNeQkouWxZ2KpQXRz6V4Cn7LZWX8G9ogb Rb8g== X-Received: by 10.182.22.18 with SMTP id z18mr22825288obe.42.1391294154921; Sat, 01 Feb 2014 14:35:54 -0800 (PST) Received: from localhost.localdomain (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPSA id ii8sm24866908obb.11.2014.02.01.14.35.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Feb 2014 14:35:54 -0800 (PST) From: Rob Herring To: arm@kernel.org Subject: [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile Date: Sat, 1 Feb 2014 16:35:44 -0600 Message-Id: <1391294144-27787-4-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391294144-27787-1-git-send-email-robherring2@gmail.com> References: <1391294144-27787-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140201_173613_964428_7789C11F X-CRM114-Status: GOOD ( 11.94 ) X-Spam-Score: -1.8 (-) Cc: Tony Lindgren , Rob Herring , Simon Horman , Magnus Damm , linux-arm-kernel@lists.infradead.org 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=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Rob Herring The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER which no longer exists. They should depend on SMP instead. Cc: Tony Lindgren Cc: Simon Horman Cc: Magnus Damm Signed-off-by: Rob Herring --- arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 653b489..e2ce4f8 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -54,7 +54,7 @@ config SOC_OMAP5 select ARM_GIC select CPU_V7 select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMP diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 3386406..05fa505 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0