From patchwork Tue Dec 1 01:25:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 7731831 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E18399F1C0 for ; Tue, 1 Dec 2015 01:26:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17EAA20663 for ; Tue, 1 Dec 2015 01:26:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 232C82064D for ; Tue, 1 Dec 2015 01:26:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755273AbbLAB02 (ORCPT ); Mon, 30 Nov 2015 20:26:28 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36617 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754944AbbLABZ0 (ORCPT ); Mon, 30 Nov 2015 20:25:26 -0500 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 89C93140977; Tue, 1 Dec 2015 01:25:25 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 76B10140992; Tue, 1 Dec 2015 01:25:25 +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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 94CC9140977; Tue, 1 Dec 2015 01:25:24 +0000 (UTC) From: Stephen Boyd To: Andy Gross Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Daniel Lezcano Subject: [PATCH v3 1/3] ARM: qcom: Make an option for qcom 'a-family' platforms Date: Mon, 30 Nov 2015 17:25:21 -0800 Message-Id: <1448933123-9843-2-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.6.3.369.g91ad409 In-Reply-To: <1448933123-9843-1-git-send-email-sboyd@codeaurora.org> References: <1448933123-9843-1-git-send-email-sboyd@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig because they are proxy configs for selecting the right clocksource driver and adjusting the text offset and there is no difference between ARCH_MSM8X60 and ARCH_MSM8960 anymore. Furthermore, there aren't configs for all the SoCs supported by the mainline kernel, leading to confusion about which SoCs are supported. So, add a new config that covers all the platforms that use the qcom clocksource driver and need the 2MB text offset adjustment and make it def_bool y so that the defconfigs keep working properly. Cc: Arnd Bergmann Signed-off-by: Stephen Boyd --- arch/arm/Makefile | 3 +-- arch/arm/mach-qcom/Kconfig | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2c2b28ee4811..dd5799dbcf26 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_ARCH_QCOM_A_FAMILY) := 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..230c7e8a32fb 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -10,6 +10,19 @@ menuconfig ARCH_QCOM if ARCH_QCOM +config ARCH_QCOM_A_FAMILY + bool "Support a-family chipsets (msm8660, msm8960, apq8064)" + default y + select CLKSRC_QCOM + help + Select this option if you want to support a-family platforms. + + A-family includes all Snapdragon S1/S2/S3/S4 chips before 2013, + up to the MSM8x60 and APQ8064 SoCs. + + B-family includes all Snapdragon 2xx/4xx/6xx/8xx models starting + in 2013 with the MSM8x74 SoC. + config ARCH_MSM8X60 bool "Enable support for MSM8X60" select CLKSRC_QCOM