From patchwork Fri Jun 14 19:33:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2724291 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0C8EBC0AB1 for ; Fri, 14 Jun 2013 20:41:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03C3720304 for ; Fri, 14 Jun 2013 20:41:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88FE720303 for ; Fri, 14 Jun 2013 20:41:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZrA-0002Yo-Hv; Fri, 14 Jun 2013 19:40:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZpC-0007iE-Ri; Fri, 14 Jun 2013 19:38:18 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZlp-0007JU-K9 for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 19:34:53 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOE00FZSE9PI770@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 20:33:31 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-cd-51bb700a7132 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 49.59.13793.A007BB15; Fri, 14 Jun 2013 20:33:30 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOE00FXFEBEW970@eusync2.samsung.com>; Fri, 14 Jun 2013 20:33:30 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 27/28] ARM: EXYNOS: Remove CONFIG_SOC_EXYNOS4412 Date: Fri, 14 Jun 2013 21:33:03 +0200 Message-id: <1371238384-1504-28-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371238384-1504-1-git-send-email-t.figa@samsung.com> References: <1371238384-1504-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xK7pcBbsDDT7uNbf4O+kYu8XTph/s Fmv2/2SyaF68ns2id8FVNouzTW/YLTY9vsZq0bNhK6vF594jjBYzzu9jsjizuJfdYu2Ru+wW e44eZrc4df0zm0X/wl4miycP+9gsDr9pZ7VYP+M1i8WxGUsYLTZ+9XAQ8fj9axKjx+I9L5k8 7lzbw+axf+4ado/NS+o9rpxoYvV4v+8qm0ffllWMHo8WtzB6HL+xncnj8ya5AO4oLpuU1JzM stQifbsEroy+KV+YCpaoVRye95KpgfGwQhcjJ4eEgInEyquX2CFsMYkL99azdTFycQgJLGWU +PmimwnC6WOSOPToDRNIFZuAmsTnhkdsILaIgKrE57YF7CBFzALXWCV+fP/BCJIQFnCQeHVv HguIzQJUdGftabA4r4CTxPvfK6DWKUgc374NLM4JFD+7fgvYUCEBR4npjUtYJjDyLmBkWMUo mlqaXFCclJ5rqFecmFtcmpeul5yfu4kREhNfdjAuPmZ1iFGAg1GJh3ei2u5AIdbEsuLK3EOM EhzMSiK8d1WBQrwpiZVVqUX58UWlOanFhxiZODilGhjNGOZrzDrDK+jx1z0ugHVvXW5AfY/w bPctHVeXSL2rjnbh6vbbuWH5vCOn14Qrln7cUNzHpbnpV6DitsP7tnyrYvwYxOjmb9gk5nkw N+9M4s7Avj/P+e0tskqZSpUnL7u8co7S6eMGYR/PTpq97eL+kDmPndNnSL6rS+Zv4O99X6yU yViweK8SS3FGoqEWc1FxIgArN/8gZwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_153449_819226_5E9F22F7 X-CRM114-Status: GOOD ( 14.04 ) X-Spam-Score: -7.2 (-------) Cc: Eduardo Valentin , Kukjin Kim , Mauro Carvalho Chehab , Arnd Bergmann , linux-pm@vger.kernel.org, Viresh Kumar , Tomasz Figa , cpufreq@vger.kernel.org, "Rafael J. Wysocki" , Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , Greg Kroah-Hartman , Olof Johansson , Zhang Rui , linux-media@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Exynos4212 and Exynos4412 SoCs differ only in number of ARM cores and there is no need to have separate Kconfig options for them, since they use the same code. This patch removes CONFIG_SOC_EXYNOS4412, leaving CONFIG_SOC_EXYNOS4212 as the one supporting both SoCs from this series. Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: Mauro Carvalho Chehab Cc: Zhang Rui Cc: Eduardo Valentin Cc: Greg Kroah-Hartman Cc: cpufreq@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-serial@vger.kernel.org Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/Kconfig | 11 +---------- arch/arm/plat-samsung/include/plat/cpu.h | 6 +----- drivers/cpufreq/Kconfig.arm | 2 +- drivers/media/platform/exynos4-is/Kconfig | 2 +- drivers/thermal/exynos_thermal.c | 2 +- drivers/tty/serial/samsung.c | 3 +-- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 47d8d9e..fe75a65 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -46,7 +46,7 @@ config CPU_EXYNOS4210 Enable EXYNOS4210 CPU support config SOC_EXYNOS4212 - bool "SAMSUNG EXYNOS4212" + bool "SAMSUNG EXYNOS4212/4412" default y depends on ARCH_EXYNOS4 select PINCTRL_EXYNOS @@ -56,15 +56,6 @@ config SOC_EXYNOS4212 help Enable EXYNOS4212 SoC support -config SOC_EXYNOS4412 - bool "SAMSUNG EXYNOS4412" - default y - depends on ARCH_EXYNOS4 - select PINCTRL_EXYNOS - select SAMSUNG_DMADEV - help - Enable EXYNOS4412 SoC support - config SOC_EXYNOS5250 bool "SAMSUNG EXYNOS5250" default y diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 989fefe..87b03bb 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h @@ -122,13 +122,9 @@ IS_SAMSUNG_CPU(exynos5440, EXYNOS5440_SOC_ID, EXYNOS5_SOC_MASK) #if defined(CONFIG_SOC_EXYNOS4212) # define soc_is_exynos4212() is_samsung_exynos4212() -#else -# define soc_is_exynos4212() 0 -#endif - -#if defined(CONFIG_SOC_EXYNOS4412) # define soc_is_exynos4412() is_samsung_exynos4412() #else +# define soc_is_exynos4212() 0 # define soc_is_exynos4412() 0 #endif diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index a924408..b214ad6 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -32,7 +32,7 @@ config ARM_EXYNOS4210_CPUFREQ SoC (S5PV310 or S5PC210). config ARM_EXYNOS4X12_CPUFREQ - def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412) + def_bool SOC_EXYNOS4212 help This adds the CPUFreq driver for Samsung EXYNOS4X12 SoC (EXYNOS4212 or EXYNOS4412). diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig index 6ff99b5..f483e11 100644 --- a/drivers/media/platform/exynos4-is/Kconfig +++ b/drivers/media/platform/exynos4-is/Kconfig @@ -32,7 +32,7 @@ config VIDEO_S5P_MIPI_CSIS To compile this driver as a module, choose M here: the module will be called s5p-csis. -if SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250 +if SOC_EXYNOS4212 || SOC_EXYNOS5250 config VIDEO_EXYNOS_FIMC_LITE tristate "EXYNOS FIMC-LITE camera interface driver" diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c index 788b1dd..f88a2ad 100644 --- a/drivers/thermal/exynos_thermal.c +++ b/drivers/thermal/exynos_thermal.c @@ -817,7 +817,7 @@ static struct exynos_tmu_platform_data const exynos4210_default_tmu_data = { #define EXYNOS4210_TMU_DRV_DATA (NULL) #endif -#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412) +#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4212) static struct exynos_tmu_platform_data const exynos_default_tmu_data = { .threshold_falling = 10, .trigger_levels[0] = 85, diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 0c8a9fa..eeb8ecb 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1714,8 +1714,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { #endif #if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \ - defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) || \ - defined(CONFIG_SOC_EXYNOS5440) + defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS5440) static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = { .info = &(struct s3c24xx_uart_info) { .name = "Samsung Exynos4 UART",