From patchwork Mon Oct 8 13:02:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1565421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 60CA840135 for ; Mon, 8 Oct 2012 13:05:31 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLCzV-0006vh-Jp; Mon, 08 Oct 2012 13:03:25 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLCz1-0006sT-QD for linux-arm-kernel@lists.infradead.org; Mon, 08 Oct 2012 13:02:56 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MBK000BTS8LUX20@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 08 Oct 2012 22:02:54 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-4a-5072cefeb37d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1D.E9.03783.EFEC2705; Mon, 08 Oct 2012 22:02:54 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MBK00KZWS8CAK90@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 08 Oct 2012 22:02:54 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] ARM: EXYNOS: Kconfig: Group EXYNOS{4212,4412} into EXYNOS4X12 Date: Mon, 08 Oct 2012 15:02:24 +0200 Message-id: <1349701345-2681-4-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1349701345-2681-1-git-send-email-t.figa@samsung.com> References: <1349701345-2681-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEJMWRmVeSWpSXmKPExsVy+t9jQd1/54oCDF5vN7HY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZk7ddZCs4K17xetYV1gbGz8JdjJwcEgImEvOnnGOGsMUkLtxb z9bFyMUhJDCdUeL95nNMEM5mJonPHdfYQarYBNQkPjc8YgOxRQQ0JKZ0PWYHKWIWWMAo8e3r aUaQhLBAiMTcDd9ZQGwWAVWJ/99bwZp5BRwldrxcygqxTl7i6f0+oEEcHJwCThLLF+WBhIWA SpbPucY0gZF3ASPDKkbR1ILkguKk9FxDveLE3OLSvHS95PzcTYxgnz+T2sG4ssHiEKMAB6MS D+8HvaIAIdbEsuLK3EOMEhzMSiK8QvuAQrwpiZVVqUX58UWlOanFhxilOViUxHmbPVIChATS E0tSs1NTC1KLYLJMHJxSDYxrnp559bfKrVLi4cnNjavn3VrE6SX769K0V4y293VrRTtar/XX fly5KeXAxZpIfb6ycJ1D93SCmSK9k9+IftBKuvlEPJOJ/d/pAyys7rG789ZuVM+5t9QlzfVN nOZszw/P1r97qmvK1F5nED6bpcmmbIY7t5Sd6/PLr1h2e3F995vhZd3C+ECJpTgj0VCLuag4 EQA+Vpav9QEAAA== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -9.0 (---------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-9.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, t.figa@samsung.com, tomasz.figa@gmail.com, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, m.szyprowski@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch adds CONFIG_EXYNOS4X12, which is automatically selected whenever there is at least one SoC from Exynos4x12 line enabled. All the shared dependencies of EXYNOS{4212,4412} are moved to this new option. This fixes build with Exynos4412 enabled and Exynos4212 and Exynos4210 disabled and also allows to simplify conditional compilation in several places. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/Kconfig | 15 +++++++++------ arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/common.h | 2 +- drivers/cpufreq/Kconfig.arm | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 9f91892..6ea95f0 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -38,22 +38,25 @@ config SOC_EXYNOS4210 help Enable EXYNOS4210 CPU support -config SOC_EXYNOS4212 - bool "SAMSUNG EXYNOS4212" - default y +config SOC_EXYNOS4X12 + def_bool n select ARCH_EXYNOS4 select SAMSUNG_DMADEV + select ARM_CPU_SUSPEND if PM select S5P_PM if PM select S5P_SLEEP if PM + +config SOC_EXYNOS4212 + bool "SAMSUNG EXYNOS4212" + select SOC_EXYNOS4X12 + default y help Enable EXYNOS4212 SoC support config SOC_EXYNOS4412 bool "SAMSUNG EXYNOS4412" - select ARCH_EXYNOS4 + select SOC_EXYNOS4X12 default y - depends on ARCH_EXYNOS4 - select SAMSUNG_DMADEV help Enable EXYNOS4412 SoC support diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index ceeb8c9..f88fcb6 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_EXYNOS) += common.o obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o obj-$(CONFIG_ARCH_EXYNOS5) += clock-exynos5.o obj-$(CONFIG_SOC_EXYNOS4210) += clock-exynos4210.o -obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o +obj-$(CONFIG_SOC_EXYNOS4X12) += clock-exynos4212.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 054c786..a8cb3e6 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -52,7 +52,7 @@ void exynos4210_register_clocks(void); #define exynos4210_register_clocks() #endif -#ifdef CONFIG_SOC_EXYNOS4212 +#ifdef CONFIG_SOC_EXYNOS4X12 void exynos4212_register_clocks(void); #else diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index ca4ede3..d0ff91a 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -66,7 +66,7 @@ config ARM_EXYNOS4210_CPUFREQ SoC (S5PV310 or S5PC210). config ARM_EXYNOS4X12_CPUFREQ - def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412) + def_bool SOC_EXYNOS4X12 help This adds the CPUFreq driver for Samsung EXYNOS4X12 SoC (EXYNOS4212 or EXYNOS4412).