From patchwork Wed Oct 15 12:50:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5085481 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 F2521C11AC for ; Wed, 15 Oct 2014 12:52:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C9C220122 for ; Wed, 15 Oct 2014 12:52:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 6414420120 for ; Wed, 15 Oct 2014 12:52:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeO2N-0004l6-DB; Wed, 15 Oct 2014 12:50:43 +0000 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeO2K-0004ZD-15 for linux-arm-kernel@lists.infradead.org; Wed, 15 Oct 2014 12:50:40 +0000 Received: by mail-wi0-f171.google.com with SMTP id em10so12818358wid.10 for ; Wed, 15 Oct 2014 05:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PSqgcrVnQ303e65NNdf925SbEnvOGbxtzhB8gukHv+c=; b=FLuOrMZG5BkvPuP0f+JGCY7ak2dOkdPEmbvrU0Htj7LX972/M6HWeGyhAhfXqlrcb2 efOhrDpi3iBaQu0fRBwRp3wPTkDaGZNLlfYuYUvC3OI1W3OqutvmyB4fz5ypwuFUN5iD JCoOk71FUByCiSYd2MdBBA/el26jwgZiy7fV8ynhS+gGgHl1KGrCQPYyZUgDEbK9p0se VNd48eeutiCTROa4m0ZFEZEuK+aPZ8NNW4YEo6UUqJ/gSvpBtSxpRJcUWERHJlZo/LOe XjtUfe6wnKFhPTNzi6QzQRtcm6SpdllFLRtrLAQFURMFyp/+Gtc1c2HPe6N2lLmXMzNZ 0iLQ== X-Received: by 10.194.119.164 with SMTP id kv4mr12643866wjb.86.1413377415936; Wed, 15 Oct 2014 05:50:15 -0700 (PDT) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id bv17sm19304803wib.13.2014.10.15.05.50.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Oct 2014 05:50:14 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] clocksource: enable pxa_timer for SA-1100 platform Date: Wed, 15 Oct 2014 16:50:04 +0400 Message-Id: <1413377405-7503-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141015_055040_220706_016D9CE3 X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -0.8 (/) Cc: Thomas Gleixner , Daniel Lezcano , Russell King X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 SA-11x0 platform used the same IP block as was used on PXA. Consequently it makes sense to have only one driver. Enable pxa_timer clocksource for StrongARM platform. Signed-off-by: Dmitry Eremin-Solenikov Acked-by: Arnd Bergmann --- drivers/clocksource/Kconfig | 6 ++++++ drivers/clocksource/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cfd6519..fd99b08 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -216,4 +216,10 @@ config CLKSRC_VERSATILE ARM Versatile, RealView and Versatile Express reference platforms. +config CLKSRC_PXA + def_bool y if ARCH_PXA || ARCH_SA1100 + help + This enables OST0 support available on PXA and SA-11x0 + platforms. + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 7fd9fd1..6d9822e 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o obj-$(CONFIG_ARCH_MARCO) += timer-marco.o obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o -obj-$(CONFIG_ARCH_PXA) += pxa_timer.o +obj-$(CONFIG_CLKSRC_PXA) += pxa_timer.o obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_ARCH_U300) += timer-u300.o obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o