From patchwork Mon Nov 16 01:36:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 7620291 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 479A0BF90C for ; Mon, 16 Nov 2015 01:37:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75D692054C for ; Mon, 16 Nov 2015 01:36:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8860A2053E for ; Mon, 16 Nov 2015 01:36:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752785AbbKPBgp (ORCPT ); Sun, 15 Nov 2015 20:36:45 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:54853 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbbKPBgm (ORCPT ); Sun, 15 Nov 2015 20:36:42 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXV003QFWH3ZL30@mailout3.w1.samsung.com>; Mon, 16 Nov 2015 01:36:39 +0000 (GMT) X-AuditID: cbfec7f4-f79c56d0000012ee-68-56493326992b Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id E8.82.04846.62339465; Mon, 16 Nov 2015 01:36:38 +0000 (GMT) Received: from localhost.localdomain ([10.252.80.64]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NXV00LLKWGJ4O20@eusync2.samsung.com>; Mon, 16 Nov 2015 01:36:38 +0000 (GMT) From: Krzysztof Kozlowski To: Sylwester Nawrocki , Tomasz Figa , Michael Turquette , Stephen Boyd , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , Kukjin Kim , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Kevin Hilman Cc: Pankaj Dubey , Krzysztof Kozlowski Subject: [PATCH 2/2] arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS Date: Mon, 16 Nov 2015 10:36:15 +0900 Message-id: <1447637775-9887-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1447637775-9887-1-git-send-email-k.kozlowski@samsung.com> References: <1447637775-9887-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsVy+t/xK7pqxp5hBtt7VCz+TjrGbvF+WQ+j xesXhhb9j18zW3w9vILRYtPja6wWH3vusVpc3jWHzWLG+X1MFhdPuVqcuv6ZzWLR1i/sFoff tLNa/DjTzWKxatcfRouXH0+wOAh4rJm3htHj969JjB7vb7Sye1zu62Xy2DnrLrvHplWdbB53 ru1h89i8pN7jyokmVo++LasYPT5vkgvgjuKySUnNySxLLdK3S+DKaP/ziLVghVDF3QcbmRsY N/F3MXJySAiYSEx4fZcNwhaTuHBvPZDNxSEksJRRYs7rFawQzn9GiYOfF4BVsQkYS2xevgSs SkSgg0WiffU+xi5GDg5mgRiJGyfyQGqEBcIk1j37ywpiswioSmyZ2QVm8wq4SVw6B7NNTuLk sclgcU4Bd4lFM1eC2UJANVu//GGfwMi7gJFhFaNoamlyQXFSeq6hXnFibnFpXrpecn7uJkZI mH/Zwbj4mNUhRgEORiUe3hNP3MOEWBPLiitzDzFKcDArifD+YPEME+JNSaysSi3Kjy8qzUkt PsQozcGiJM47d9f7ECGB9MSS1OzU1ILUIpgsEwenVANj3krz/BdpWaEFAW1e1y1VL2fm6m+5 17BXYfGysqTdnuwdxuy6YlukfxlrLNr/5qPR1aPFt3riH22R45j1R37uHe7Q0r7zcRnXeaZ3 yVSos7edL160ZpLWLka1zQm+D1LsmWqWZfyonPJiF/MjS8trR1z4Z/jHyDSz/s32KXil51dx +PfU5A9KLMUZiYZazEXFiQA4m7oxbwIAAA== 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=-7.5 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 The ARMv8 Exynos family SoCs in Linux kernel are currently: - Exynos5433 (controlled by ARCH_EXYNOS), - Exynos7 (controlled by ARCH_EXYNOS7). It duplicates Kconfig symbols unnecessarily, so consolidate them into one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS symbol. The commit should not bring any visible functional change. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Chanwoo Choi Reviewed-by: Pankaj Dubey Tested-by: Alim Akhtar Reviewed-by: Tomasz Figa --- arch/arm64/Kconfig.platforms | 11 ++--------- arch/arm64/boot/dts/exynos/Makefile | 2 +- arch/arm64/configs/defconfig | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 4043c35962cc..afa19baca94e 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -13,21 +13,14 @@ config ARCH_BERLIN This enables support for Marvell Berlin SoC Family config ARCH_EXYNOS - bool - help - This enables support for Samsung Exynos SoC family - -config ARCH_EXYNOS7 - bool "ARMv8 based Samsung Exynos7" - select ARCH_EXYNOS + bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS - help - This enables support for Samsung Exynos7 SoC family + This enables support for Samsung Exynos ARMv8 SoC family config ARCH_LAYERSCAPE bool "ARMv8 based Freescale Layerscape SoC family" diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile index 20310e5b6d6f..50c9b9383cfa 100644 --- a/arch/arm64/boot/dts/exynos/Makefile +++ b/arch/arm64/boot/dts/exynos/Makefile @@ -1,4 +1,4 @@ -dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb +dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bdd7aa358d2a..a396fa7c69a5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_BCM_IPROC=y CONFIG_ARCH_BERLIN=y -CONFIG_ARCH_EXYNOS7=y +CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_HISI=y CONFIG_ARCH_MEDIATEK=y