From patchwork Mon Jun 17 16:34:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2735191 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B52D39F3A0 for ; Mon, 17 Jun 2013 16:35:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 991072046E for ; Mon, 17 Jun 2013 16:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 433702046C for ; Mon, 17 Jun 2013 16:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752392Ab3FQQfK (ORCPT ); Mon, 17 Jun 2013 12:35:10 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:41745 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752907Ab3FQQe7 (ORCPT ); Mon, 17 Jun 2013 12:34:59 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOJ00MBNQ1N6260@mailout3.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 17 Jun 2013 17:34:54 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-51-51bf3aaedcb9 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 9F.4B.07878.EAA3FB15; Mon, 17 Jun 2013 17:34:54 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOJ002RHQ1OMHC0@eusync3.samsung.com>; Mon, 17 Jun 2013 17:34:54 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , Marek Szyprowski , Sylwester Nawrocki , Thomas Abraham , Tomasz Figa , Kyungmin Park Subject: [PATCH v2 30/38] ARM: EXYNOS: Remove CONFIG_SOC_EXYNOS4412 Date: Mon, 17 Jun 2013 18:34:15 +0200 Message-id: <1371486863-12398-31-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371486863-12398-1-git-send-email-t.figa@samsung.com> References: <1371486863-12398-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkluLIzCtJLcpLzFFi42I5/e/4Vd11VvsDDVr3GVv8nXSM3aJ3wVU2 i7NNb9gtNj2+xmox4/w+Jou1R+6yW5y6/pnN4vCbdlaL9TNes1gcm7GE0YHL4/evSYwed67t YfPYvKTe48qJJlaPvi2rGD0+b5ILYIvisklJzcksSy3St0vgytjRuYm9YAd/xY+dfxkbGL/w dDFyckgImEg8/PmeBcIWk7hwbz0biC0ksJRR4n8PcxcjF5DdxyRxqmEpK0iCTUBN4nPDI7Ai EQFVic9tC9hBipgFXjJJ3G18wA6SEBZwluh/2w3WwAJUtOPrT2YQmxco/qbtHxPENgWJ49u3 MYLYnEDxxX23mCE2O0nsnnmJdQIj7wJGhlWMoqmlyQXFSem5RnrFibnFpXnpesn5uZsYIcH3 dQfj0mNWhxgFOBiVeHgTxfYHCrEmlhVX5h5ilOBgVhLhjZ24L1CINyWxsiq1KD++qDQntfgQ IxMHp1QDo7hW3dqoJatefwk5OFc345DiWYtnvtrye1Y4dFSkdHw64bddgE8tYu5uw94vy5Ye ndv5hLfgg93aj99jMpPf/Do6lUv+7hM2KfFpLM1Wt1Iuz3sVoDJXlrWX47vKtNu6KXa9a3eo 7jBImKjoUO8185jY6mOP+bseNlRlCE59ac+7c8Lk4E4WXiWW4oxEQy3mouJEAJijZEYcAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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. 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 +----- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 65ca3ac..fcebdfb 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