From patchwork Wed Mar 19 10:25:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 26549 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2AF9E203C3 for ; Wed, 19 Mar 2014 10:31:40 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf20951623veb.1 for ; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Uli08TcygMnZPkssS8C1qgVLgTmPOpGHHhl+uV0ub+c=; b=cQreUxtBWTK5/nhEcGX2akCOL+6TOITmD6sscoNiMe6BbhAfBJKoV2zFavpvivJssF +Qrc+1d5F5pz3uI3YVZL2Jy5oMqucL1zGVWPKxM8PPPeA8zqyLuOspoG8u+Y7Exh6x7K RnFa1mVcDGnqTMGAtz7xHCvjbtDwUvYKC14cOUTrHoDALqWudLZRnZBpVr2/pDZnKFw5 6weltb71qnEOTwrNamObvagyG1xaHRVvc0v4oxxmWqNRrjusRXK9sKr3Q169RoSsKkHk HnKADWqnSIcst9Z7heGrjxcCNRlKUja1qgWivmHEjr9pyzrwPK43CJUkNJxIN1TYDUB5 hsTg== X-Gm-Message-State: ALoCoQmnWwTaUv3D5HepCbLqjHqZdT5UUuuvnmFP0fwy1gXGTOq7oQ8zyPgg5NRtdtnyiFhKLpbX X-Received: by 10.236.43.14 with SMTP id k14mr3540296yhb.37.1395225099941; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.102 with SMTP id q93ls2457160qgq.67.gmail; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr28317173vec.6.1395225099734; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id xv15si4339779veb.206.2014.03.19.03.31.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 03:31:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so8477416veb.40 for ; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) X-Received: by 10.52.69.146 with SMTP id e18mr24918833vdu.15.1395225099651; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp287172vck; Wed, 19 Mar 2014 03:31:39 -0700 (PDT) X-Received: by 10.68.102.34 with SMTP id fl2mr39813744pbb.2.1395225098505; Wed, 19 Mar 2014 03:31:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zm8si14628882pac.440.2014.03.19.03.31.32; Wed, 19 Mar 2014 03:31:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758847AbaCSKbb (ORCPT + 8 others); Wed, 19 Mar 2014 06:31:31 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:48256 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758259AbaCSKba (ORCPT ); Wed, 19 Mar 2014 06:31:30 -0400 Received: by mail-pa0-f43.google.com with SMTP id bj1so8760235pad.2 for ; Wed, 19 Mar 2014 03:31:30 -0700 (PDT) X-Received: by 10.66.148.98 with SMTP id tr2mr27023398pab.33.1395225089999; Wed, 19 Mar 2014 03:31:29 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id kc9sm60944281pbc.25.2014.03.19.03.31.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 03:31:28 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kgene.kim@samsung.com, mark.rutland@arm.com, sachin.kamat@linaro.org Subject: [PATCH Resend 1/3] ARM: EXYNOS: Consolidate Kconfig entries Date: Wed, 19 Mar 2014 15:55:03 +0530 Message-Id: <1395224705-2935-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Instead of repeating the Kconfig entries for every SoC, move them under ARCH_EXYNOS4 and 5 and move the entries common to both 4 and 5 under ARCH_EXYNOS. Also, since the individual SoCs do not have any specific machine/platform code, keep them as boolean symbols instead of user selectable and select them from Exynos4 and 5 config symbols. Individual SoC symbols can be removed eventually once the driver Kconfig dependencies on these symbols are removed. Signed-off-by: Sachin Kamat Acked-by: Tomasz Figa --- This is a resend of the series rebased on top of latest linux-next and Tomasz Figa's PM consolidation series 1 and 2. --- arch/arm/Kconfig | 10 +++++ arch/arm/mach-exynos/Kconfig | 89 +++++++++++------------------------------- 2 files changed, 33 insertions(+), 66 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index afc751f750b9..e2428a18f2a6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -821,18 +821,28 @@ config ARCH_S5PV210 config ARCH_EXYNOS bool "Samsung EXYNOS" + select ARCH_HAS_BANDGAP select ARCH_HAS_CPUFREQ select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_REQUIRE_GPIOLIB select ARCH_SPARSEMEM_ENABLE + select ARM_AMBA select ARM_GIC + select CLKSRC_OF select COMMON_CLK select CPU_V7 select GENERIC_CLOCKEVENTS + select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C_RTC if RTC_CLASS + select HAVE_SMP select NEED_MACH_MEMORY_H + select PINCTRL + select PINCTRL_EXYNOS + select PM_GENERIC_DOMAINS if PM_RUNTIME + select S5P_DEV_MFC + select SAMSUNG_DMADEV select SPARSE_IRQ select USE_OF help diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index fc8bf18e222d..9398bab87a76 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -14,90 +14,32 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y - select ARM_AMBA - select CLKSRC_OF + select ARM_CPU_SUSPEND if PM_SLEEP select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 select CPU_EXYNOS4210 select GIC_NON_BANKED select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select HAVE_ARM_SCU if SMP - select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 - select PINCTRL - select PM_GENERIC_DOMAINS if PM_RUNTIME - select S5P_DEV_MFC + select SOC_EXYNOS4212 + select SOC_EXYNOS4412 help - Samsung EXYNOS4 SoCs based systems + Samsung EXYNOS4 (Cortex-A9) SoC based systems config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" - select ARM_AMBA - select CLKSRC_OF - select HAVE_ARM_SCU if SMP - select HAVE_SMP - select PINCTRL - help - Samsung EXYNOS5 (Cortex-A15) SoC based systems - -comment "EXYNOS SoCs" - -config CPU_EXYNOS4210 - bool "SAMSUNG EXYNOS4210" - default y - depends on ARCH_EXYNOS4 - select ARCH_HAS_BANDGAP - select ARM_CPU_SUSPEND if PM_SLEEP - select PINCTRL_EXYNOS - select SAMSUNG_DMADEV - help - Enable EXYNOS4210 CPU support - -config SOC_EXYNOS4212 - bool "SAMSUNG EXYNOS4212" default y - depends on ARCH_EXYNOS4 - select ARCH_HAS_BANDGAP - select PINCTRL_EXYNOS - select SAMSUNG_DMADEV + select SOC_EXYNOS5250 + select SOC_EXYNOS5420 help - Enable EXYNOS4212 SoC support + Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems -config SOC_EXYNOS4412 - bool "SAMSUNG EXYNOS4412" - default y - depends on ARCH_EXYNOS4 - select ARCH_HAS_BANDGAP - select PINCTRL_EXYNOS - select SAMSUNG_DMADEV - help - Enable EXYNOS4412 SoC support - -config SOC_EXYNOS5250 - bool "SAMSUNG EXYNOS5250" - default y - depends on ARCH_EXYNOS5 - select ARCH_HAS_BANDGAP - select PINCTRL_EXYNOS - select PM_GENERIC_DOMAINS if PM_RUNTIME - select S5P_DEV_MFC - select SAMSUNG_DMADEV - help - Enable EXYNOS5250 SoC support - -config SOC_EXYNOS5420 - bool "SAMSUNG EXYNOS5420" - default y - depends on ARCH_EXYNOS5 - select PM_GENERIC_DOMAINS if PM_RUNTIME - help - Enable EXYNOS5420 SoC support +comment "EXYNOS SoCs" config SOC_EXYNOS5440 bool "SAMSUNG EXYNOS5440" default y depends on ARCH_EXYNOS5 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE - select ARCH_HAS_BANDGAP select ARCH_HAS_OPP select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR @@ -110,4 +52,19 @@ config SOC_EXYNOS5440 endmenu +config CPU_EXYNOS4210 + bool + +config SOC_EXYNOS4212 + bool + +config SOC_EXYNOS4412 + bool + +config SOC_EXYNOS5250 + bool + +config SOC_EXYNOS5420 + bool + endif