From patchwork Wed Nov 25 21:04:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 7702981 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 27010BF90C for ; Wed, 25 Nov 2015 21:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48E8320829 for ; Wed, 25 Nov 2015 21:06:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B01E20826 for ; Wed, 25 Nov 2015 21:06: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 1a1hFY-0004bY-Lp; Wed, 25 Nov 2015 21:05:12 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1hFM-00041Z-Sl for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2015 21:05:02 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id BE6BE1406CF; Wed, 25 Nov 2015 21:04:40 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id AF90C14070A; Wed, 25 Nov 2015 21:04:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 17BD01406CF; Wed, 25 Nov 2015 21:04:40 +0000 (UTC) From: Stephen Boyd To: Andy Gross Subject: [PATCH v2 1/3] ARM: qcom: Make an option for qcom clocksource platforms Date: Wed, 25 Nov 2015 13:04:36 -0800 Message-Id: <1448485478-21699-2-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.6.3.369.g91ad409 In-Reply-To: <1448485478-21699-1-git-send-email-sboyd@codeaurora.org> References: <1448485478-21699-1-git-send-email-sboyd@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151125_130501_028215_E8EECEC6 X-CRM114-Status: GOOD ( 14.59 ) X-Spam-Score: -3.2 (---) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, Daniel Lezcano , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig because they are mostly proxy configs for selecting the right clocksource driver. Therefore, make a new config for platforms that use the qcom clocksource driver. We'll also make this the determining factor for if we should adjust the text offset by 2MB or not, because the two go hand in hand. Cc: Arnd Bergmann Signed-off-by: Stephen Boyd --- arch/arm/Makefile | 3 +-- arch/arm/mach-qcom/Kconfig | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2c2b28ee4811..999d523ac09f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -148,8 +148,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 ifeq ($(CONFIG_ARCH_SA1100),y) textofs-$(CONFIG_SA1111) := 0x00208000 endif -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 +textofs-$(CONFIG_HAVE_CLKSRC_QCOM) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 # Machine directory name. This list is sorted alphanumerically diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 2256cd1e25d1..35a03967d9c2 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -10,6 +10,14 @@ menuconfig ARCH_QCOM if ARCH_QCOM +config HAVE_CLKSRC_QCOM + bool "Support platforms with qcom clocksource" + default y + select CLKSRC_QCOM + help + Select this option if you want to support platforms + with the qcom clocksource such as MSM8660 and MSM8960. + config ARCH_MSM8X60 bool "Enable support for MSM8X60" select CLKSRC_QCOM