From patchwork Mon Oct 8 13:02:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1565431 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 74E41DFFAD 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 1TLCzJ-0006ty-Aa; Mon, 08 Oct 2012 13:03:13 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLCyz-0006ri-37 for linux-arm-kernel@lists.infradead.org; Mon, 08 Oct 2012 13:02:53 +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:51 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-40-5072cefbe0f3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1C.E9.03783.BFEC2705; Mon, 08 Oct 2012 22:02:51 +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:51 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] ARM: EXYNOS: Kconfig: Sort out dependencies between options Date: Mon, 08 Oct 2012 15:02:23 +0200 Message-id: <1349701345-2681-3-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+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jQd3f54oCDK4dVrTY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZNzbfYSr4qlCx/I1fA+NK6S5GTg4JAROJP20/WCFsMYkL99az dTFycQgJTGeU+Dp3IiOEs5lJ4tDFWcwgVWwCahKfGx6xgdgiAhoSU7oes4MUMQssYJT49vU0 I0hCWCBAYvaan2A2i4CqxIuld8FsXgFHiROf/zBDrJOXeHq/D2gQBwengJPE8kV5IGEhoJLl c64xTWDkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMj2OPPpHYwrmywOMQowMGoxMP7 Qa8oQIg1say4MvcQowQHs5IIr9A+oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeZo+UACGB9MSS 1OzU1ILUIpgsEwenVAPjVp+TkvdkF4c0m7YHqUkfWC/WNJHnCvfSNXZ7X2lfvNTRET7vrZ+c q3/xqgkuTsnm/28yVF4UWX7eOW9JY8psEQcXzvJOfv7VdsYXr+SzSh2TzOXvmH/xaexEiQOT rKeK7ai8zOHTyqhastWVZ4r1R939s8Py1v9ScPjUPnVz/5W1n57dKahSYinOSDTUYi4qTgQA +zBu0PQBAAA= 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 modifies the dependencies between Exynos-related Kconfig options to represent the real dependencies between code units more closely. Originally it was possible to enable ARCH_EXYNOS{4,5} without any SOC_EXYNOS_{4,5}.* enabled, which could end with compilation or link errors. Now ARCH_EXYNOS{4,5} is only selected when there is a SOC_EXYNOS_{4,5}.* enabled, which requires it. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/Kconfig | 15 ++++++--------- drivers/devfreq/Kconfig | 2 +- drivers/mmc/host/sdhci-s3c.c | 2 +- drivers/tty/serial/samsung.c | 3 +-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 05dcd07..9f91892 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -12,15 +12,14 @@ if ARCH_EXYNOS menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 - bool "SAMSUNG EXYNOS4" - default y + def_bool n select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 help Samsung EXYNOS4 SoCs based systems config ARCH_EXYNOS5 - bool "SAMSUNG EXYNOS5" + def_bool n select HAVE_SMP help Samsung EXYNOS5 (Cortex-A15) SoC based systems @@ -30,7 +29,7 @@ comment "EXYNOS SoCs" config SOC_EXYNOS4210 bool "SAMSUNG EXYNOS4210" default y - depends on ARCH_EXYNOS4 + select ARCH_EXYNOS4 select SAMSUNG_DMADEV select ARM_CPU_SUSPEND if PM select S5P_PM if PM @@ -42,7 +41,7 @@ config SOC_EXYNOS4210 config SOC_EXYNOS4212 bool "SAMSUNG EXYNOS4212" default y - depends on ARCH_EXYNOS4 + select ARCH_EXYNOS4 select SAMSUNG_DMADEV select S5P_PM if PM select S5P_SLEEP if PM @@ -51,6 +50,7 @@ config SOC_EXYNOS4212 config SOC_EXYNOS4412 bool "SAMSUNG EXYNOS4412" + select ARCH_EXYNOS4 default y depends on ARCH_EXYNOS4 select SAMSUNG_DMADEV @@ -60,7 +60,7 @@ config SOC_EXYNOS4412 config SOC_EXYNOS5250 bool "SAMSUNG EXYNOS5250" default y - depends on ARCH_EXYNOS5 + select ARCH_EXYNOS5 select SAMSUNG_DMADEV select S5P_PM if PM select S5P_SLEEP if PM @@ -176,8 +176,6 @@ config EXYNOS_SETUP_SPI # machine support -if ARCH_EXYNOS4 - comment "EXYNOS4210 Boards" config MACH_SMDKC210 @@ -397,7 +395,6 @@ config MACH_SMDK4412 select MACH_SMDK4212 help Machine support for Samsung SMDK4412 -endif comment "Flattened Device Tree based board for EXYNOS SoCs" diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 8545069..c559609 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -67,7 +67,7 @@ comment "DEVFREQ Drivers" config ARM_EXYNOS4_BUS_DEVFREQ bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" - depends on SOC_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412 + depends on ARCH_EXYNOS4 select ARCH_HAS_OPP select DEVFREQ_GOV_SIMPLE_ONDEMAND help diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index b090415..5e2083b 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -716,7 +716,7 @@ static const struct dev_pm_ops sdhci_s3c_pmops = { #define SDHCI_S3C_PMOPS NULL #endif -#if defined(CONFIG_SOC_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) +#if defined(CONFIG_ARCH_EXYNOS4) static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = { .sdhci_quirks = SDHCI_QUIRK_NONSTANDARD_CLOCK, }; diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 175ba6e..c689091 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1594,8 +1594,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { #define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL #endif -#if defined(CONFIG_SOC_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \ - defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) +#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5) static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = { .info = &(struct s3c24xx_uart_info) { .name = "Samsung Exynos4 UART",