From patchwork Wed Jul 24 16:18:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Austin X-Patchwork-Id: 2832929 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 0C68FC0319 for ; Wed, 24 Jul 2013 16:25:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC09D202F6 for ; Wed, 24 Jul 2013 16:25:15 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62257202F1 for ; Wed, 24 Jul 2013 16:25:14 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V21s3-00065n-PO; Wed, 24 Jul 2013 16:24:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V21nB-0000Y7-Js; Wed, 24 Jul 2013 16:19:57 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V21mx-0000WD-La for linux-arm-kernel@lists.infradead.org; Wed, 24 Jul 2013 16:19:44 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 24 Jul 2013 17:19:20 +0100 Received: from e102895-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Wed, 24 Jul 2013 17:19:19 +0100 From: Jonathan Austin To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] clocksource: Add missing dependency on CONFIG_OF for ARM_ARCH_TIMER Date: Wed, 24 Jul 2013 17:18:52 +0100 Message-Id: <1374682733-7416-3-git-send-email-jonathan.austin@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374682733-7416-1-git-send-email-jonathan.austin@arm.com> References: <1374682733-7416-1-git-send-email-jonathan.austin@arm.com> X-OriginalArrivalTime: 24 Jul 2013 16:19:19.0993 (UTC) FILETIME=[8D206290:01CE8889] X-MC-Unique: 113072417192003701 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130724_121943_961937_37D7F1F6 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -2.6 (--) Cc: Jonathan Austin 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Initialisation of the ARM Arch timer requires data from the DT. There is no fallback initialisation method and hence selecting ARM_ARCH_TIMER without OF makes little sense. Furthermore, doing so causes a build error because the of_* stubs for !CONFIG_OF do not extend to all of the functions being used by this driver, and will not be extended unless there are valid use-cases for them to be (this is not a valid case). Signed-off-by: Jonathan Austin --- drivers/clocksource/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index b7b9b04..4348902 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -72,7 +72,8 @@ config CLKSRC_DBX500_PRCMU_SCHED_CLOCK config ARM_ARCH_TIMER bool - select CLKSRC_OF if OF + depends on OF + select CLKSRC_OF config ARM_GLOBAL_TIMER bool