From patchwork Wed Jul 17 20:31:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2828989 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 B2DDEC0AB2 for ; Wed, 17 Jul 2013 20:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6D4E201EB for ; Wed, 17 Jul 2013 20:34:48 +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 A69A420305 for ; Wed, 17 Jul 2013 20:34:47 +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 1UzYOq-0004Z7-Kh; Wed, 17 Jul 2013 20:32:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzYOF-0007XZ-Nv; Wed, 17 Jul 2013 20:31:59 +0000 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzYNy-0007Uk-Ib for linux-arm-kernel@lists.infradead.org; Wed, 17 Jul 2013 20:31:43 +0000 Received: by mail-pa0-f41.google.com with SMTP id bj3so2386029pad.28 for ; Wed, 17 Jul 2013 13:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=C+W21uskGOGXfg8JOAcCxuE39LC60yWSBNLNQzDazzc=; b=A8ii5xcXipvqqDxXe1SASyXj4+osr8diG1FdOAPdGAFeGYZNQMJHLtLKTieNtLAa3r 9zudRahlhpVeELu4XhzIHvD0Iyltnj/FrJYS2fXLd1CfsQufclV+ZfJFFxPb97Ivy2BP xqmMekBa1cRt3a6Ilp6/p+TKTfbj/ZTyztm55hbrYq31yYOPiur80L2dBwe0EfIWm5Rs +ekvugTTEoW53JcZkh5JCGV4SIRb4hUwBZkzURt+083/enNhLM/K8oShnDvfR8J5z+jK M9Vbe7sHGswoKLCy7fUiaaK1ArLO/h329lDeaiNeGDbjVol4ZILxXym5F6tbrWSgT5EU W2Yg== X-Received: by 10.68.130.38 with SMTP id ob6mr8523045pbb.154.1374093081102; Wed, 17 Jul 2013 13:31:21 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id iq3sm9557716pbb.20.2013.07.17.13.31.18 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 13:31:20 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 18 Jul 2013 05:31:27 +0900 Message-Id: <20130717203127.27542.41663.sendpatchset@w520> In-Reply-To: <20130717203049.27542.78385.sendpatchset@w520> References: <20130717203049.27542.78385.sendpatchset@w520> Subject: [PATCH 04/04] ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130717_163142_741413_E4CFB4B2 X-CRM114-Status: UNSURE ( 7.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, shinya.kuribayashi.px@renesas.com, 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.5 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: Magnus Damm Move the timer configuration bits to allow use in case of ARCH_SHMOBILE or ARCH_SHMOBILE_MULTI. The timers all make use of the regular driver model so they are safe to enable for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) --- 0005/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-07-09 12:07:23.000000000 +0900 @@ -30,6 +30,8 @@ config MACH_KZM9D_REFERENCE of not supporting a number of devices. This is intended to aid developers + +comment "SH-Mobile System Configuration" endif if ARCH_SHMOBILE @@ -243,6 +245,15 @@ config CPU_HAS_INTEVT bool default y +config SH_CLK_CPG + bool + +source "drivers/sh/Kconfig" + +endif + +if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI + menu "Timer and clock configuration" config SHMOBILE_TIMER_HZ @@ -277,9 +288,4 @@ config EM_TIMER_STI endmenu -config SH_CLK_CPG - bool - -source "drivers/sh/Kconfig" - endif