From patchwork Fri Sep 13 09:28:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 2882371 Return-Path: X-Original-To: patchwork-linux-arm@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 5CEDF9F1C0 for ; Fri, 13 Sep 2013 09:30:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A42F020444 for ; Fri, 13 Sep 2013 09:29:57 +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 A056D20420 for ; Fri, 13 Sep 2013 09:29:55 +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 1VKPh0-0004mW-LN; Fri, 13 Sep 2013 09:29:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VKPgo-0006s6-GJ; Fri, 13 Sep 2013 09:29:22 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VKPgi-0006ne-Ql for linux-arm-kernel@lists.infradead.org; Fri, 13 Sep 2013 09:29:19 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MT2009RN4ZIX3L0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 13 Sep 2013 18:28:44 +0900 (KST) X-AuditID: cbfee61b-b7f776d0000016c8-72-5232dacca4f9 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E8.2F.05832.CCAD2325; Fri, 13 Sep 2013 18:28:44 +0900 (KST) Received: from amdc1032.localnet ([106.116.147.136]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MT200CHE4ZVZS10@mmp1.samsung.com>; Fri, 13 Sep 2013 18:28:44 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: kgene.kim@samsung.com Subject: [PATCH] ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options Date: Fri, 13 Sep 2013 11:28:31 +0200 Message-id: <3809234.0NkWBIjRC9@amdc1032> User-Agent: KMail/4.8.4 (Linux/3.2.0-52-generic-pae; KDE/4.8.5; i686; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOLMWRmVeSWpSXmKPExsVy+t9jAd0zt4yCDB5/17XoXXCVzeJs0xt2 i02Pr7FazDi/j8mBxWPzknqPvi2rGD0+b5ILYI7isklJzcksSy3St0vgyvj7SLbgjUzFtw32 DYwNEl2MnBwSAiYSVz/3sUHYYhIX7q0Hsrk4hAQWMUo8u97HCOG0MEms/nOPGaSKTcBKYmL7 KkYQW0RAUqKp4Q9YnFkgQ2Lm/fMsILawgJ/EgV2H2UFsFgFViasTLwDVcHDwCmhKvD9oBhIW FfCU+DRpKVgrr4CgxI/J91ggxshL7Ns/lRXC1pJYv/M40wRGvllIymYhKZuFpGwBI/MqRtHU guSC4qT0XCO94sTc4tK8dL3k/NxNjODgeya9g3FVg8UhRgEORiUe3o4YoyAh1sSy4srcQ4wS HMxKIrxfVgOFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8x5stQ4UEkhPLEnNTk0tSC2CyTJxcEo1 MEqtTLrQNvdD/de8KG2t5ks7j7swTVt0caam/I/Y1MB7UWfLZilGXfdQzAzt6dtldXPaqde9 AndPiVuumBB9/JBapkLJiqNHhVdEm/JJzsjmlCnxPVQee1nPa4I7x6OZclnz2m461/3T4Dlc u2PrXPdG9xvf1+g7qPNGMqQec9IWNM+K7W4qUGIpzkg01GIuKk4EAM2hA/k6AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130913_052917_139552_4E8B1CCE X-CRM114-Status: GOOD ( 13.32 ) X-Spam-Score: -7.8 (-------) Cc: kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 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 EXYNOS is now Device Tree (DT) only platform so it makes no sense to have config options responsible for enabling platform specific DT support. Moreover the kernel image won't even link if neither CONFIG_MACH_EXYNOS4_DT nor CONFIG_MACH_EXYNOS5_DT config option is enabled (linker fails with "no machine record defined" error). Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard CONFIG_ARCH_EXYNOS[4,5] ones instead. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Kyungmin Park Acked-by: Tomasz Figa --- arch/arm/configs/exynos_defconfig | 1 - arch/arm/mach-exynos/Kconfig | 38 +++++++++----------------------------- arch/arm/mach-exynos/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index ad7dfbb..5181d0d 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -11,7 +11,6 @@ CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=3 CONFIG_S3C24XX_PWM=y CONFIG_ARCH_EXYNOS5=y -CONFIG_MACH_EXYNOS4_DT=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index cb36807..b810f2f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y + select ARM_AMBA + select CLKSRC_OF + 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 S5P_DEV_MFC help Samsung EXYNOS4 SoCs 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 + select USB_ARCH_HAS_XHCI help Samsung EXYNOS5 (Cortex-A15) SoC based systems @@ -110,35 +119,6 @@ config SOC_EXYNOS5440 help Enable EXYNOS5440 SoC support -comment "Flattened Device Tree based board for EXYNOS SoCs" - -config MACH_EXYNOS4_DT - bool "Samsung Exynos4 Machine using device tree" - default y - depends on ARCH_EXYNOS4 - select ARM_AMBA - select CLKSRC_OF - select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 - select CPU_EXYNOS4210 - select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select S5P_DEV_MFC - help - Machine support for Samsung Exynos4 machine with device tree enabled. - Select this if a fdt blob is available for the Exynos4 SoC based board. - Note: This is under development and not all peripherals can be supported - with this machine file. - -config MACH_EXYNOS5_DT - bool "SAMSUNG EXYNOS5 Machine using device tree" - default y - depends on ARCH_EXYNOS5 - select ARM_AMBA - select CLKSRC_OF - select USB_ARCH_HAS_XHCI - help - Machine support for Samsung EXYNOS5 machine with device tree enabled. - Select this if a fdt blob is available for the EXYNOS5 SoC based board. - endmenu endif diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 5369615..8930b66 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -32,5 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) # machine support -obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o -obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o +obj-$(CONFIG_ARCH_EXYNOS4) += mach-exynos4-dt.o +obj-$(CONFIG_ARCH_EXYNOS5) += mach-exynos5-dt.o